API: (bug 12760) meta=userinfo&uiprop=ratelimits doesn't list group-specific rate...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2abbdf8..7d13474 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -444,6 +444,8 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 16225) Titles like Talk:Talk:Foo broke apfrom and friends
 * meta=siteinfo&siprop=interwikimap no longer throws an exception for empty
   sifilter parameter.
+* (bug 12760) meta=userinfo&uiprop=ratelimits doesn't list group-specific rate
+  limits
 
 === Languages updated in 1.14 ===
 

diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index c938604..c399e68 100644 (file)
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -113,6 +113,7 @@ class ApiQueryUserInfo extends ApiQueryBase {
                        if(!$wgUser->isAnon())
                                $categories[] = 'newbie';
                }
+               $categories = array_merge($categories, $wgUser->getGroups());
 
                // Now get the actual limits
                $retval = array();