Merge pull request #669 from awellis13/feature/where_nested-closure-fix

where_nested breaks on empty closures
2012-05-11 12:17:22 -07:00
parent b097b6c682 8e12e7a819
commit 4cff0907a0
1 changed files with 4 additions and 1 deletions
--- a/laravel/database/query.php
+++ b/laravel/database/query.php
@@ -414,7 +414,10 @@ class Query {
 		// Once the callback has been run on the query, we will store the nested
 		// query instance on the where clause array so that it's passed to the
 		// query's query grammar instance when building.
-		$this->wheres[] = compact('type', 'query', 'connector');
+		if ($query->wheres !== null)
+		{
+			$this->wheres[] = compact('type', 'query', 'connector');
+		}

 		$this->bindings = array_merge($this->bindings, $query->bindings);