Work on section handling.

taylorotwell · taylorotwell · commit d2fefa65aa5c · 2012-11-06T15:04:13.000-06:00
diff --git a/artisan b/artisan
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.2.11
+ * @version  3.2.12
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */
diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md
@@ -2,6 +2,8 @@
 
 ## Contents
 
+- [Laravel 3.2.12](#3.2.12)
+- [Upgrading From 3.2.11](#upgrade-3.2.12)
 - [Laravel 3.2.11](#3.2.11)
 - [Upgrading From 3.2.10](#upgrade-3.2.11)
 - [Laravel 3.2.10](#3.2.10)
@@ -47,6 +49,16 @@
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-3.1)
 
+<a name="3.2.12"></a>
+## Laravel 3.2.12
+
+- Clear sections on a complete render operation.
+
+<a name="upgrade-3.2.12"></a>
+### Upgrading From 3.2.11
+
+- Replace the **laravel** folder.
+
 <a name="3.2.11"></a>
 ## Laravel 3.2.11
 
diff --git a/laravel/view.php b/laravel/view.php
@@ -51,6 +51,13 @@ class View implements ArrayAccess {
 	 */
 	public static $last;
 
+	/**
+	 * The render operations taking place.
+	 *
+	 * @var int
+	 */
+	public static $render_count = 0;
+
 	/**
 	 * The Laravel view loader event name.
 	 *
@@ -327,19 +334,32 @@ public static function render_each($view, array $data, $iterator, $empty = 'raw|
 	 */
 	public function render()
 	{
+		static::$render_count++;
+
 		Event::fire("laravel.composing: {$this->view}", array($this));
 
+		$contents = null;
+
 		// If there are listeners to the view engine event, we'll pass them
 		// the view so they can render it according to their needs, which
 		// allows easy attachment of other view parsers.
 		if (Event::listeners(static::engine))
 		{
 			$result = Event::until(static::engine, array($this));
 
-			if ( ! is_null($result)) return $result;
+			if ( ! is_null($result)) $contents = $result;
+		}
+
+		if (is_null($contents)) $contents = $this->get();
+
+		static::$render_count--;
+
+		if (static::$render_count == 0)
+		{
+			Section::$sections = array();
 		}
 
-		return $this->get();
+		return $contents;
 	}
 
 	/**
diff --git a/paths.php b/paths.php
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.2.11
+ * @version  3.2.12
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */
diff --git a/public/index.php b/public/index.php
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.2.11
+ * @version  3.2.12
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* Laravel - A PHP Framework For Web Artisans`
`4`	`4`	`*`
`5`	`5`	`* @package Laravel`
`6`		`- * @version 3.2.11`
	`6`	`+ * @version 3.2.12`
`7`	`7`	`* @author Taylor Otwell <taylorotwell@gmail.com>`
`8`	`8`	`* @link http://laravel.com`
`9`	`9`	`*/`