From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 26 Mar 2011 18:39:22 +0000 (+0000)
Subject: Followup r84363
X-Git-Tag: 1.31.0-rc.0~31177
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=76a4e7d4ceff49bc75320be61438131dac49217e;p=lhc%2Fweb%2Fwiklou.git

Followup r84363

Looks like I made a complete hash of that commit. Commit correct version from vm working copy
---

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 5180ff4e19..03634367c3 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -216,23 +216,26 @@ class ApiQueryAllUsers extends ApiQueryBase {
 			}
 
 			// Add user's group info
-			if ( $fld_groups && !is_null( $row->ug_group2 ) ) {
+			if ( $fld_groups ) {
 				if ( !isset( $lastUserData['groups'] ) ) {
 					$lastUserData['groups'] = ApiQueryUsers::getAutoGroups( User::newFromName( $lastUser ) );
 				}
 
-				$lastUserData['groups'][] = $row->ug_group2;
+				if ( !is_null( $row->ug_group2 ) ) {
+					$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 ( $fld_rights ) {
+				if ( !isset( $lastUserData['rights'] ) ) {
+					$lastUserData['rights'] =  User::getGroupPermissions( User::getImplicitGroups() );
 				}
 				if ( !is_null( $row->ug_group2 ) ) {
-					$lastUserData['groups'][] = $row->ug_group2;
+					$lastUserData['rights'] = array_unique( array_merge( $lastUserData['rights'],
+					                                        User::getGroupPermissions( array( $row->ug_group2 ) ) ) );
 				}
-				$result->setIndexedTagName( $lastUserData['groups'], 'g' );
+				$result->setIndexedTagName( $lastUserData['rights'], 'r' );
 			}
 		}