From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 20 Mar 2011 00:23:41 +0000 (+0000)
Subject: Actually list implicit groups in allusers.
X-Git-Tag: 1.31.0-rc.0~31306
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=e696d174eb4d241ac6bc604c33d7ad8b38eac9a9;p=lhc%2Fweb%2Fwiklou.git

Actually list implicit groups in allusers.

Looks like I might've regressed this in the course of fixing other bugs. Oh well, fixed now
---

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 0376431a1a..a2657fb4e8 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -225,14 +225,14 @@ class ApiQueryAllUsers extends ApiQueryBase {
 				$result->setIndexedTagName( $lastUserData['groups'], 'g' );
 			}
 
-			if ( $fld_rights && !is_null( $row->ug_group2 ) ) {
-				if ( !isset( $lastUserData['rights'] ) ) {
-					$lastUserData['rights'] = User::getGroupPermissions( User::getImplicitGroups() );
+			if ( $fld_groups ) {
+				if ( !isset( $lastUserData['groups'] ) ) {
+					$lastUserData['groups'] = ApiQueryUsers::getAutoGroups( User::newFromName( $lastUser ) );
 				}
-
-				$lastUserData['rights'] = array_unique( array_merge( $lastUserData['rights'],
-					User::getGroupPermissions( array( $row->ug_group2 ) ) ) );
-				$result->setIndexedTagName( $lastUserData['rights'], 'r' );
+				if ( !is_null( $row->ug_group2 ) ) {
+					$lastUserData['groups'][] = $row->ug_group2;
+				}
+				$result->setIndexedTagName( $lastUserData['groups'], 'g' );
 			}
 		}