Merge "doMaintenance: Try to print errors to stderr"

[lhc/web/wiklou.git] / includes / api / ApiQueryAllUsers.php

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index d7adb9b..59e92e1 100644 (file)
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -141,7 +141,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
                                        LIST_OR
                                ) ];
                        }
-                       $this->addJoinConds( [ 'ug1' => [ 'LEFT OUTER JOIN',
+                       $this->addJoinConds( [ 'ug1' => [ 'LEFT JOIN',
                                array_merge( [
                                        'ug1.ug_user=user_id',
                                        'ug1.ug_expiry IS NULL OR ug1.ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
@@ -285,8 +285,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        }
                        if ( $params['activeusers'] ) {
                                $data['recentactions'] = (int)$row->recentactions;
-                               // @todo 'recenteditcount' is set for BC, remove in 1.25
-                               $data['recenteditcount'] = $data['recentactions'];
                        }
                        if ( $fld_registration ) {
                                $data['registration'] = $row->user_registration ?
@@ -395,7 +393,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
        protected function getExamplesMessages() {
                return [
                        'action=query&list=allusers&aufrom=Y'
-                               => 'apihelp-query+allusers-example-Y',
+                               => 'apihelp-query+allusers-example-y',
                ];
        }