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

Followup r84363

Browse source 
Looks like I made a complete hash of that commit. Commit correct version from vm working copy
This commit is contained in:
Sam Reed 2011-03-26 18:39:22 +00:00
parent e943d7ed3f
commit 76a4e7d4ce
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
includes/api/ApiQueryAllUsers.php
View file

@ -216,24 +216,27 @@ class ApiQueryAllUsers extends ApiQueryBase {
}
// Add user's group info
if ( $fld_groups && !is_null( $row->ug_group2 ) ) {
if ( !isset( $lastUserData['groups'] ) ) {
$lastUserData['groups'] = ApiQueryUsers::getAutoGroups( User::newFromName( $lastUser ) );
}
$lastUserData['groups'][] = $row->ug_group2;
$result->setIndexedTagName( $lastUserData['groups'], 'g' );
}
if ( $fld_groups ) {
if ( !isset( $lastUserData['groups'] ) ) {
$lastUserData['groups'] = ApiQueryUsers::getAutoGroups( User::newFromName( $lastUser ) );
}
if ( !is_null( $row->ug_group2 ) ) {
$lastUserData['groups'][] = $row->ug_group2;
}
$result->setIndexedTagName( $lastUserData['groups'], 'g' );
}
if ( $fld_rights ) {
if ( !isset( $lastUserData['rights'] ) ) {
$lastUserData['rights'] = User::getGroupPermissions( User::getImplicitGroups() );
}
if ( !is_null( $row->ug_group2 ) ) {
$lastUserData['rights'] = array_unique( array_merge( $lastUserData['rights'],
User::getGroupPermissions( array( $row->ug_group2 ) ) ) );
}
$result->setIndexedTagName( $lastUserData['rights'], 'r' );
}
}
if ( is_array( $lastUserData ) ) {