Fix for r56885, r58364, r58364: use a two-part GROUP BY even on MySQL. The implicit...

diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php
index a5f1b3c..7d907fb 100644 (file)
--- a/includes/specials/SpecialActiveusers.php
+++ b/includes/specials/SpecialActiveusers.php
@@ -68,8 +68,6 @@ class ActiveUsersPager extends UsersPager {
        }
 
        function getQueryInfo() {
-               global $wgDBtype;
-
                $dbr = wfGetDB( DB_SLAVE );
                $conds = array( 'rc_user > 0' ); // Users - no anons
                $conds[] = 'ipb_deleted IS NULL'; // don't show hidden names
@@ -83,12 +81,12 @@ class ActiveUsersPager extends UsersPager {
                        'tables' => array( 'recentchanges', 'user', 'ipblocks' ),
                        'fields' => array( 'rc_user_text AS user_name', // inheritance
                                'rc_user_text', // for Pager
-                               'MAX(user_id) AS user_id',
+                               'user_id',
                                'COUNT(*) AS recentedits',
                                'MAX(ipb_user) AS blocked'
                        ),
                        'options' => array(
-                               'GROUP BY' => ( $dbr->implicitGroupby() || $wgDBtype == 'sqlite' ) ? 'rc_user_text' : 'rc_user_text, user_id',
+                               'GROUP BY' => 'rc_user_text, user_id',
                                'USE INDEX' => array( 'recentchanges' => 'rc_user_text' )
                        ),
                        'join_conds' => array(