where_nested no longer breaks on closures that don't actually set anything

2012-05-11 13:11:02 -06:00
parent b097b6c682
commit 8e12e7a819
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);