From c62b074da7b2c9eb5ed4a60b49f30532d0972b7f Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Mon, 18 Jul 2011 16:09:50 +0000 Subject: [PATCH] Remove call to User::getImplicitGroups() from ApiQueryAllUsers Per the below, as User::getGroupsWithPermission() will return */autoconfirmed, etc if applicable > var_dump( User::getGroupsWithPermission( 'createtalk' ) ); array(2) { [0]=> string(1) "*" [1]=> string(4) "user" } > var_dump( User::getGroupsWithPermission( 'autoconfirmed' ) ); array(5) { [0]=> string(13) "autoconfirmed" [1]=> string(3) "bot" [2]=> string(5) "sysop" [3]=> string(8) "reviewer" [4]=> string(9) "confirmed" } --- includes/api/ApiQueryAllUsers.php | 2 +- includes/specials/SpecialListusers.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php index a5a11f6a31..22f56268e9 100644 --- a/includes/api/ApiQueryAllUsers.php +++ b/includes/api/ApiQueryAllUsers.php @@ -76,7 +76,7 @@ class ApiQueryAllUsers extends ApiQueryBase { $groups = array_merge( $groups, User::getGroupsWithPermission( $r ) ); } - $groups = array_diff( array_unique( $groups ), User::getImplicitGroups() ); + $groups = array_unique( $groups ); if ( is_null( $params['group'] ) ) { $params['group'] = $groups; diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php index b8f42f1170..0531444a1f 100644 --- a/includes/specials/SpecialListusers.php +++ b/includes/specials/SpecialListusers.php @@ -256,7 +256,7 @@ class UsersPager extends AlphabeticPager { */ protected static function getGroups( $uid ) { $user = User::newFromId( $uid ); - $groups = array_diff( $user->getEffectiveGroups(), $user->getImplicitGroups() ); + $groups = array_diff( $user->getEffectiveGroups(), User::getImplicitGroups() ); return $groups; } -- 2.20.1