Merge pull request #2515 from najdanovicivan/layout-renderer-fix

Layout Renderer Fix

Author: lonnieezell

system/View/View.php

@@ -480,9 +480,10 @@ public function renderSection(string $sectionName)
 			return;
 		}
 
-		foreach ($this->sections[$sectionName] as $contents)
+		foreach ($this->sections[$sectionName] as $key => $contents)
 		{
 			echo $contents;
+			unset($this->sections[$sectionName][$key]);
 		}
 	}
 

tests/system/View/ViewTest.php

@@ -276,6 +276,18 @@ public function testRenderLayoutExtendsCorrectly()
 		$this->assertContains($expected, $view->render('extend'));
 	}
 
+	public function testRenderLayoutExtendsMultipleCalls()
+	{
+		$view = new View($this->config, $this->viewsDir, $this->loader);
+
+		$view->setVar('testString', 'Hello World');
+		$expected = "<p>Open</p>\n<h1>Hello World</h1>\n<p>Hello World</p>";
+
+		$view->render('extend');
+
+		$this->assertContains($expected, $view->render('extend'));
+	}
+
 	public function testRenderLayoutMakesDataAvailableToBoth()
 	{
 		$view = new View($this->config, $this->viewsDir, $this->loader);