Allow raw conditions on insertSelect, given that array syntax isn't always expressive...

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 4967d77..4d56a5c 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2531,7 +2531,10 @@ abstract class DatabaseBase implements DatabaseType {
                        " FROM $srcTable $useIndex ";
 
                if ( $conds != '*' ) {
-                       $sql .= ' WHERE ' . $this->makeList( $conds, LIST_AND );
+                       if ( is_array( $conds ) ) {
+                               $conds = $this->makeList( $conds, LIST_AND );
+                       }
+                       $sql .= " WHERE $conds";
                }
 
                $sql .= " $tailOpts";