From 057667cd6c81ca72402ef75d50711a1e41ab5805 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 9 Sep 2017 14:33:38 -0700 Subject: [PATCH] Remove use of implicitGroupBy() in ActiveUsersPager Bug: T160298 Change-Id: Id8963924f036e9ed3fcdde3a8e54b7126b72356e --- includes/specials/pagers/ActiveUsersPager.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php index 0665e112ee..64af71a16a 100644 --- a/includes/specials/pagers/ActiveUsersPager.php +++ b/includes/specials/pagers/ActiveUsersPager.php @@ -118,16 +118,15 @@ class ActiveUsersPager extends UsersPager { ) . ')'; } - if ( $dbr->implicitGroupby() ) { - $options = [ 'GROUP BY' => [ 'qcc_title' ] ]; - } else { - $options = [ 'GROUP BY' => [ 'user_name', 'user_id', 'qcc_title' ] ]; - } - return [ 'tables' => $tables, - 'fields' => [ 'user_name', 'user_id', 'recentedits' => 'COUNT(*)', 'qcc_title' ], - 'options' => $options, + 'fields' => [ + 'qcc_title', + 'user_name' => 'qcc_title', + 'user_id' => 'MAX(user_id)', + 'recentedits' => 'COUNT(*)' + ], + 'options' => [ 'GROUP BY' => [ 'qcc_title' ] ], 'conds' => $conds ]; } -- 2.20.1