Commit 4cff0907 by Taylor Otwell

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

where_nested breaks on empty closures
parents b097b6c6 8e12e7a8
...@@ -414,7 +414,10 @@ class Query { ...@@ -414,7 +414,10 @@ class Query {
// 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.
if ($query->wheres !== null)
{
$this->wheres[] = compact('type', 'query', 'connector'); $this->wheres[] = compact('type', 'query', 'connector');
}
$this->bindings = array_merge($this->bindings, $query->bindings); $this->bindings = array_merge($this->bindings, $query->bindings);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment