fix Bug#26274: Database layer should allow arrays for ORDER BY, GROUP BY

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 1a04639..5adf5da 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -950,7 +950,10 @@ abstract class DatabaseBase implements DatabaseType {
                }
 
                if ( isset( $options['GROUP BY'] ) ) {
-                       $preLimitTail .= " GROUP BY {$options['GROUP BY']}";
+                       $gb = is_array( $options['GROUP BY'] )
+                               ? implode( ',', $options['GROUP BY'] )
+                               : $options['GROUP BY'];
+                       $preLimitTail .= " GROUP BY {$gb}";
                }
 
                if ( isset( $options['HAVING'] ) ) {
@@ -958,7 +961,10 @@ abstract class DatabaseBase implements DatabaseType {
                }
 
                if ( isset( $options['ORDER BY'] ) ) {
-                       $preLimitTail .= " ORDER BY {$options['ORDER BY']}";
+                       $ob = is_array( $options['ORDER BY'] )
+                               ? implode( ',', $options['ORDER BY'] )
+                               : $options['ORDER BY'];
+                       $preLimitTail .= " ORDER BY {$ob}";
                }
 
                // if (isset($options['LIMIT'])) {