Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Siebrand 2012-09-01 12:33:07 +00:00 committed by Gerrit Code Review
commit fae05504fe
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/api/ApiQueryAllUsers.php
View file

@ -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 ) {

6
includes/api/ApiQueryUserInfo.php
View file

@ -76,14 +76,12 @@ class ApiQueryUserInfo extends ApiQueryBase {
}
if ( isset( $this->prop['groups'] ) ) {
$autolist = ApiQueryUsers::getAutoGroups( $user );
$vals['groups'] = array_merge( $autolist, $user->getGroups() );
$vals['groups'] = $user->getEffectiveGroups();
$result->setIndexedTagName( $vals['groups'], 'g' ); // even if empty
}
if ( isset( $this->prop['implicitgroups'] ) ) {
$vals['implicitgroups'] = ApiQueryUsers::getAutoGroups( $user );
$vals['implicitgroups'] = $user->getAutomaticGroups();
$result->setIndexedTagName( $vals['implicitgroups'], 'g' ); // even if empty
}

17
includes/api/ApiQueryUsers.php
View file

@ -138,7 +138,7 @@ class ApiQueryUsers extends ApiQueryBase {
if ( isset( $this->prop['groups'] ) ) {
if ( !isset( $data[$name]['groups'] ) ) {
$data[$name]['groups'] = self::getAutoGroups( $user );
$data[$name]['groups'] = $user->getAutomaticGroups();
}
if ( !is_null( $row->ug_group ) ) {
@ -148,7 +148,7 @@ class ApiQueryUsers extends ApiQueryBase {
}
if ( isset( $this->prop['implicitgroups'] ) && !isset( $data[$name]['implicitgroups'] ) ) {
$data[$name]['implicitgroups'] = self::getAutoGroups( $user );
$data[$name]['implicitgroups'] = $user->getAutomaticGroups();
}
if ( isset( $this->prop['rights'] ) ) {
@ -249,20 +249,15 @@ class ApiQueryUsers extends ApiQueryBase {
/**
* Gets all the groups that a user is automatically a member of (implicit groups)
*
* @deprecated since 1.20; call User::getAutomaticGroups() directly.
* @param $user User
* @return array
*/
public static function getAutoGroups( $user ) {
// FIXME this logic is duplicated from User::getEffectiveGroups(), centralize this
$groups = array();
$groups[] = '*';
wfDeprecated( __METHOD__, '1.20' );
if ( !$user->isAnon() ) {
$groups[] = 'user';
$groups = array_merge( $groups, Autopromote::getAutopromoteGroups( $user ) );
}
return $groups;
return $user->getAutomaticGroups();
}
public function getCacheMode( $params ) {