From 2ef3083b140bfaab267ba66d9269ee254e62ea51 Mon Sep 17 00:00:00 2001
From: KyleKatarn <kylekatarnls@gmail.com>
Date: Mon, 5 Feb 2018 12:15:07 +0100
Subject: [PATCH] Make self option applied also on shared variables

---
 src/Phug/Renderer/Partial/AdapterTrait.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Phug/Renderer/Partial/AdapterTrait.php b/src/Phug/Renderer/Partial/AdapterTrait.php
index a4a917b..60457d2 100644
--- a/src/Phug/Renderer/Partial/AdapterTrait.php
+++ b/src/Phug/Renderer/Partial/AdapterTrait.php
@@ -125,7 +125,7 @@ private function getSandboxCall(&$source, $method, $path, $input, callable $getS
                 $adapter = $this->getAdapter();
                 $display = function () use ($adapter, $path, $input, $getSource, $parameters) {
                     /* @var CacheInterface $adapter */
-                    $adapter->displayCached($path, $input, $getSource, $this->mergeWithSharedVariables($parameters));
+                    $adapter->displayCached($path, $input, $getSource, $parameters);
                 };
 
                 return in_array($method, ['display', 'displayFile'])
@@ -137,7 +137,7 @@ private function getSandboxCall(&$source, $method, $path, $input, callable $getS
 
             return $adapter->$method(
                 $source,
-                $this->mergeWithSharedVariables($parameters)
+                $parameters
             );
         });
     }
@@ -195,7 +195,7 @@ public function callAdapter($method, $path, $input, callable $getSource, array $
         $input = $renderEvent->getInput();
         $path = $renderEvent->getPath();
         $method = $renderEvent->getMethod();
-        $parameters = $renderEvent->getParameters();
+        $parameters = $this->mergeWithSharedVariables($renderEvent->getParameters());
         if ($self = $this->getOption('self')) {
             $self = $self === true ? 'self' : strval($self);
             $parameters = [