Use built-in array_merge() function to deal with multiple queries.

Ensure every query has an associated result, even if the query is empty.
GPHemsley · Mar 26, 2012 · 9b99821 · 9b99821
1 parent 5283d0f
commit 9b99821
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/inc/database/database.mysql.php b/inc/database/database.mysql.php
@@ -153,12 +153,11 @@ function query( $query )
 		}
 		else
 		{
+			$queries = array();
+
 			if( is_array( $query ) )
 			{
-				foreach( $query as $single_query )
-				{
-						$queries[] = $single_query;
-				}
+				$queries = array_merge( $queries, $query );
 			}
 			else
 			{
@@ -187,6 +186,10 @@ function query( $query )
 						$this->results[$this->query_count] = $result;
 					}
 				}
+				else
+				{
+					$results[$this->query_count] = FALSE;
+				}
 			}
 
 			return ( ( count( $results ) > 1 ) ? $results : $results[$this->query_count] );