fix parent placeholding

laravel · Jan 24, 2017 · 64f7e9c · 64f7e9c
1 parent 17a46cd
commit 64f7e9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Illuminate/View/Concerns/ManagesLayouts.php b/src/Illuminate/View/Concerns/ManagesLayouts.php
@@ -25,7 +25,7 @@ trait ManagesLayouts
      *
      * @var string
      */
-    protected static $parentPlaceholder;
+    protected static $parentPlaceholder = [];
 
     /**
      * Start injecting content into a section.
@@ -164,11 +164,11 @@ public function yieldContent($section, $default = '')
      */
     public static function parentPlaceholder($section = '')
     {
-        if (! static::$parentPlaceholder) {
-            static::$parentPlaceholder = '##parent-placeholder-'.sha1($section).'##';
+        if (! isset(static::$parentPlaceholder[$section])) {
+            static::$parentPlaceholder[$section] = '##parent-placeholder-'.sha1($section).'##';
         }
 
-        return static::$parentPlaceholder;
+        return static::$parentPlaceholder[$section];
     }
 
     /**

diff --git a/tests/View/ViewFactoryTest.php b/tests/View/ViewFactoryTest.php
@@ -213,7 +213,7 @@ public function testBasicSectionHandling()
 
     public function testSectionExtending()
     {
-        $placeholder = \Illuminate\View\Factory::parentPlaceholder();
+        $placeholder = \Illuminate\View\Factory::parentPlaceholder('foo');
         $factory = $this->getFactory();
         $factory->startSection('foo');
         echo 'hi '.$placeholder;
@@ -226,7 +226,7 @@ public function testSectionExtending()
 
     public function testSectionMultipleExtending()
     {
-        $placeholder = \Illuminate\View\Factory::parentPlaceholder();
+        $placeholder = \Illuminate\View\Factory::parentPlaceholder('foo');
         $factory = $this->getFactory();
         $factory->startSection('foo');
         echo 'hello '.$placeholder.' nice to see you '.$placeholder;