From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 9 Sep 2017 21:33:38 +0000 (-0700)
Subject: Remove use of implicitGroupBy() in ActiveUsersPager
X-Git-Tag: 1.31.0-rc.0~2053^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=057667cd6c81ca72402ef75d50711a1e41ab5805;p=lhc%2Fweb%2Fwiklou.git

Remove use of implicitGroupBy() in ActiveUsersPager

Bug: T160298
Change-Id: Id8963924f036e9ed3fcdde3a8e54b7126b72356e
---

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
 		];
 	}