From f45330a006cd9f88e90a47fdf497334c7a92b094 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 13 Apr 2012 08:23:11 -0500
Subject: [PATCH 1/2] call render method on view when including in blade.

---
 laravel/blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/laravel/blade.php b/laravel/blade.php
index 7e6d33c9..e3111d09 100644
--- a/laravel/blade.php
+++ b/laravel/blade.php
@@ -264,7 +264,7 @@ protected static function compile_includes($value)
 	{
 		$pattern = static::matcher('include');
 
-		return preg_replace($pattern, '$1<?php echo view$2->with(get_defined_vars()); ?>', $value);
+		return preg_replace($pattern, '$1<?php echo view$2->with(get_defined_vars())->render(); ?>', $value);
 	}
 
 	/**

From 728a320cbcaab0e4edb9280c7239a8c20633967c Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 13 Apr 2012 08:24:42 -0500
Subject: [PATCH 2/2] increment version and update change log.

---
 artisan          |  2 +-
 changes.md       | 12 ++++++++++++
 paths.php        |  2 +-
 public/index.php |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/artisan b/artisan
index d8e05547..cc35412d 100644
--- a/artisan
+++ b/artisan
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.7
+ * @version  3.1.8
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */
diff --git a/changes.md b/changes.md
index d751ae5e..a0fecebe 100644
--- a/changes.md
+++ b/changes.md
@@ -2,6 +2,8 @@ ## Laravel Change Log
 
 ## Contents
 
+- [Laravel 3.1.8](#3.1.8)
+- [Upgrading From 3.1.7](#upgrade-3.1.8)
 - [Laravel 3.1.7](#3.1.7)
 - [Upgrading From 3.1.6](#upgrade-3.1.7)
 - [Laravel 3.1.6](#3.1.6)
@@ -19,6 +21,16 @@ ## Contents
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-3.1)
 
+<a name="3.1.8"></a>
+## Laravel 3.1.8
+
+- Fixes possible WSOD when using Blade's @include expression.
+
+<a name="upgrade-3.1.8"></a>
+## Upgrading From 3.1.7
+
+- Replace the **laravel** folder.
+
 <a name="3.1.7"></a>
 ## Laravel 3.1.7
 
diff --git a/paths.php b/paths.php
index fe4fbfa7..5755eecf 100644
--- a/paths.php
+++ b/paths.php
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.7
+ * @version  3.1.8
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */
diff --git a/public/index.php b/public/index.php
index 8a6217ce..2826b9bc 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,7 +3,7 @@
  * Laravel - A PHP Framework For Web Artisans
  *
  * @package  Laravel
- * @version  3.1.7
+ * @version  3.1.8
  * @author   Taylor Otwell <taylorotwell@gmail.com>
  * @link     http://laravel.com
  */