API: sinumberingroup now gives correct size of 'user' group, and omits size of implic...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8868105..4c4e024 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -400,6 +400,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 24166) API error when using rvprop=tags
 * Introduced "asynchronous download" mode for upload-by-url. Requires 
   $wgAllowAsyncCopyUploads to be true.
+* sinumberingroup correctly gives size of 'user' group, and omits size of
+  implicit groups rather than showing 0.
 
 === Languages updated in 1.17 ===
 

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index d2a4c18..61a2b7b 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -331,8 +331,17 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                'name' => $group,
                                'rights' => array_keys( $permissions, true ),
                        );
+                       
                        if ( $numberInGroup ) {
-                               $arr['number'] = SiteStats::numberInGroup( $group );
+                               global $wgAutopromote;
+                       
+                               if ($group == 'user') {
+                                       $arr['number'] = SiteStats::users();
+                                       
+                               // '*' and autopromote groups have no size
+                               } elseif (!($group == '*' || in_array($group, array_keys($wgAutopromote)))) {
+                                       $arr['number'] = SiteStats::numberInGroup( $group );
+                               }
                        }
                        
                        $groupArr = array(