Merge "Make Special:ChangeContentModel field labels consistently use colons"

[lhc/web/wiklou.git] / includes / specials / pagers / ActiveUsersPager.php

diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php
index 39da076..7703e20 100644 (file)
--- a/includes/specials/pagers/ActiveUsersPager.php
+++ b/includes/specials/pagers/ActiveUsersPager.php
@@ -155,7 +155,7 @@ class ActiveUsersPager extends UsersPager {
                                'user_id' => 'user_id',
                                'recentedits' => 'COUNT(rc_id)'
                        ],
-                       'options' => [ 'GROUP BY' => [ 'qcc_title' ] ],
+                       'options' => [ 'GROUP BY' => [ 'qcc_title', 'user_id' ] ],
                        'conds' => $conds,
                        'join_conds' => $jconds,
                ];
@@ -225,7 +225,18 @@ class ActiveUsersPager extends UsersPager {
                $userName = $row->user_name;
 
                $ulinks = Linker::userLink( $row->user_id, $userName );
-               $ulinks .= Linker::userToolLinks( $row->user_id, $userName );
+               $ulinks .= Linker::userToolLinks(
+                       $row->user_id,
+                       $userName,
+                       // Should the contributions link be red if the user has no edits (using default)
+                       false,
+                       // Customisation flags (using default 0)
+                       0,
+                       // User edit count (using default)
+                       null,
+                       // do not wrap the message in parentheses (CSS will provide these)
+                       false
+               );
 
                $lang = $this->getLanguage();