* (bug 27469) label implicit groups in list=allusers&auprop=groups/list=users&usprop...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index aecd3bd..78c8d67 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -269,6 +269,8 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 28104) Namespace for local pages in interwiki backlinks (iwbacklinks)
   is missing
 * (bug 27343) Add parseddescription to list=filearchive
+* (bug 27469) label implicit groups in list=allusers&auprop=groups/
+  list=users&usprop=groups
 
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index c01302d..114708f 100644 (file)
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -245,18 +245,26 @@ class ApiQueryUsers extends ApiQueryBase {
        }
 
        /**
-       * Gets all the groups that a user is automatically a member of
+       * Gets all the groups that a user is automatically a member of (implicit groups)
        * @param $user User
        * @return array
        */
        public static function getAutoGroups( $user ) {
-               $groups = array( '*' );
+               $groups = array();
+               $groups[] = '*';
 
                if ( !$user->isAnon() ) {
                        $groups[] = 'user';
                }
 
-               return array_merge( $groups, Autopromote::getAutopromoteGroups( $user ) );
+               $builtGroups = array();
+               $i = 0;
+               foreach( array_merge( $groups, Autopromote::getAutopromoteGroups( $user ) ) as $g ) {
+                       $builtGroups[$i] = array( 'implicit' => '' );
+                       ApiResult::setContent( $builtGroups[$i], $g );
+                       $i++;
+               }
+               return $builtGroups;
        }
 
        public function getCacheMode( $params ) {