Merge "Follow-up I0b781c11 (2a55449): use User::getAutomaticGroups()."

diff --combined includes/api/ApiQueryAllUsers.php
index 1325662,fcc0b02..7f50cba
--- 1/includes/api/ApiQueryAllUsers.php
--- 2/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@@ -152,7 -152,7 +152,7 @@@ class ApiQueryAllUsers extends ApiQuery
                                'INNER JOIN', 'rc_user_text=user_name'
                        ) ) );
  
 -                      $this->addFields( 'COUNT(*) AS recentedits' );
 +                      $this->addFields( array( 'recentedits' => 'COUNT(*)' ) );
  
                        $this->addWhere( 'rc_log_type IS NULL OR rc_log_type != ' . $db->addQuotes( 'newusers' ) );
                        $timestamp = $db->timestamp( wfTimestamp( TS_UNIX ) - $wgActiveUserDays*24*3600 );
@@@ -252,7 -252,7 +252,7 @@@
                        if ( $fld_groups ) {
                                if ( !isset( $lastUserData['groups'] ) ) {
                                        if ( $lastUserObj ) {
-                                               $lastUserData['groups'] = ApiQueryUsers::getAutoGroups( $lastUserObj );
+                                               $lastUserData['groups'] = $lastUserObj->getAutomaticGroups();
                                        } else {
                                                // This should not normally happen
                                                $lastUserData['groups'] = array();
@@@ -267,7 -267,7 +267,7 @@@
                        }
  
                        if ( $fld_implicitgroups && !isset( $lastUserData['implicitgroups'] ) && $lastUserObj ) {
-                               $lastUserData['implicitgroups'] = ApiQueryUsers::getAutoGroups( $lastUserObj );
+                               $lastUserData['implicitgroups'] = $lastUserObj->getAutomaticGroups();
                                $result->setIndexedTagName( $lastUserData['implicitgroups'], 'g' );
                        }
                        if ( $fld_rights ) {