jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396551 )

Change subject: Copy in Field changes from 
Id8963924f036e9ed3fcdde3a8e54b7126b72356e
......................................................................


Copy in Field changes from Id8963924f036e9ed3fcdde3a8e54b7126b72356e

Bug: T160298
Change-Id: Ifaf4f9147def0fdb31287a5b894a1d11cbcbdf70
---
M RELEASE-NOTES-1.27
M includes/specials/pagers/ActiveUsersPager.php
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 7bf6428..7917537 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -4,6 +4,7 @@
 
 === Changes since 1.27.4 ===
 * Upgraded Moment.js from v2.8.4 to v2.19.3.
+* (T160298) Fixed Special:ActiveUsers due to bad backport.
 
 == MediaWiki 1.27.4 ==
 This is a security and maintenance release of the MediaWiki 1.27 branch.
diff --git a/includes/specials/pagers/ActiveUsersPager.php 
b/includes/specials/pagers/ActiveUsersPager.php
index 72635fe..977f450 100644
--- a/includes/specials/pagers/ActiveUsersPager.php
+++ b/includes/specials/pagers/ActiveUsersPager.php
@@ -117,7 +117,12 @@
 
                return [
                        'tables' => [ 'querycachetwo', 'user', 'recentchanges' 
],
-                       'fields' => [ 'user_name', 'user_id', 'recentedits' => 
'COUNT(*)', 'qcc_title' ],
+                       'fields' => [
+                               'qcc_title',
+                               'user_name' => 'qcc_title',
+                               'user_id' => 'MAX(user_id)',
+                               'recentedits' => 'COUNT(*)'
+                       ],
                        'options' => [ 'GROUP BY' => [ 'qcc_title' ] ],
                        'conds' => $conds
                ];

-- 
To view, visit https://gerrit.wikimedia.org/r/396551
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaf4f9147def0fdb31287a5b894a1d11cbcbdf70
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Kghbln <mediaw...@kghoffmeyer.de>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to