Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

where_nested breaks on empty closures
This commit is contained in:
Taylor Otwell 2012-05-11 12:17:22 -07:00
parent b097b6c682 8e12e7a819
commit 4cff0907a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
laravel/database/query.php
View File

@ -414,7 +414,10 @@ public function where_nested($callback, $connector = 'AND')
// Once the callback has been run on the query, we will store the nested // 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 instance on the where clause array so that it's passed to the
// query's query grammar instance when building. // 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); $this->bindings = array_merge($this->bindings, $query->bindings);