diff options
| author | Alexandre Emsenhuber <ialex.wiki@gmail.com> | 2012-08-03 21:41:44 +0200 |
|---|---|---|
| committer | Alexandre Emsenhuber <ialex.wiki@gmail.com> | 2012-08-03 21:41:44 +0200 |
| commit | 1e8992ca7489e620d157d9a50d9aa5e611b84887 (patch) | |
| tree | 6cb40f7c963700fc6a1037586cd9d1e1772fe482 /includes/api/ApiQueryAllUsers.php | |
| parent | 2a55449257b6a8b7e259cd8f5208b4734bd312d2 (diff) | |
| download | mediawikicore-1e8992ca7489e620d157d9a50d9aa5e611b84887.tar.gz mediawikicore-1e8992ca7489e620d157d9a50d9aa5e611b84887.zip | |
Follow-up I0b781c11 (2a55449): use User::getAutomaticGroups().
No need to duplicate the code of User::getAutomaticGroups() in
ApiQueryUsers::getAutoGroups(), instead just call that method
directly.
Also deprecated the latter in favour of the former and replaced
all calls in core.
Change-Id: I224cb610cbd6a927a4c7f7137951416368f8cb5d
Diffstat (limited to 'includes/api/ApiQueryAllUsers.php')
| -rw-r--r-- | includes/api/ApiQueryAllUsers.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php index 1e29a6483227..fcc0b02f7060 100644 --- a/includes/api/ApiQueryAllUsers.php +++ b/includes/api/ApiQueryAllUsers.php @@ -252,7 +252,7 @@ class ApiQueryAllUsers extends ApiQueryBase { 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 @@ class ApiQueryAllUsers extends ApiQueryBase { } if ( $fld_implicitgroups && !isset( $lastUserData['implicitgroups'] ) && $lastUserObj ) { - $lastUserData['implicitgroups'] = ApiQueryUsers::getAutoGroups( $lastUserObj ); + $lastUserData['implicitgroups'] = $lastUserObj->getAutomaticGroups(); $result->setIndexedTagName( $lastUserData['implicitgroups'], 'g' ); } if ( $fld_rights ) { |