API: (bug 16398) meta=userinfo&uiprop=rights lists a right twice if it's granted...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7d13474..2337e54 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -446,6 +446,7 @@ The following extensions are migrated into MediaWiki 1.14:
   sifilter parameter.
 * (bug 12760) meta=userinfo&uiprop=ratelimits doesn't list group-specific rate
   limits
+* (bug 16398) meta=userinfo&uiprop=rights lists some rights twice in some cases
 
 === Languages updated in 1.14 ===
 

diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index c399e68..1bc30ae 100644 (file)
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -76,7 +76,8 @@ class ApiQueryUserInfo extends ApiQueryBase {
                        $result->setIndexedTagName($vals['groups'], 'g');       // even if empty
                }
                if (isset($this->prop['rights'])) {
-                       $vals['rights'] = $wgUser->getRights();
+                       // User::getRights() may return duplicate values, strip them
+                       $vals['rights'] = array_unique($wgUser->getRights());
                        $result->setIndexedTagName($vals['rights'], 'r');       // even if empty
                }
                if (isset($this->prop['options'])) {