Fix Query::lists() for empty resultsets

kbanman · kbanman · commit e3a000af4100 · 2012-08-11T15:52:58.000-07:00
diff --git a/laravel/database/query.php b/laravel/database/query.php
@@ -605,7 +605,7 @@ public function lists($column, $key = null)
 		// set the keys on the array of values using the array_combine
 		// function provided by PHP, which should give us the proper
 		// array form to return from the method.
-		if ( ! is_null($key))
+		if ( ! is_null($key) && count($results))
 		{
 			return array_combine(array_map(function($row) use ($key)
 			{

Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ public function lists($column, $key = null)`
`605`	`605`	`// set the keys on the array of values using the array_combine`
`606`	`606`	`// function provided by PHP, which should give us the proper`
`607`	`607`	`// array form to return from the method.`
`608`		`- if ( ! is_null($key))`
	`608`	`+ if ( ! is_null($key) && count($results))`
`609`	`609`	`{`
`610`	`610`	`return array_combine(array_map(function($row) use ($key)`
`611`	`611`	`{`