API: (bug 17502) meta=siteinfo&siprop=namespacealiases no longer lists namespace...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5bb7bd5..054a92b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -213,6 +213,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17433) Added bot flag to list=watchlist&wlprop=flags output
 * (bug 16740) Added list=protectedtitles
 * Added mainmodule and pagesetmodule parameters to action=paraminfo
+* (bug 17502) meta=siteinfo&siprop=namespacealiases no longer lists namespace
+  aliases already listed in siprop=namespaces
 
 === Languages updated in 1.15 ===
 

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 9a3d7c4..7e72a8f 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -168,6 +168,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                global $wgNamespaceAliases, $wgContLang;
                $wgContLang->load();
                $aliases = array_merge($wgNamespaceAliases, $wgContLang->namespaceAliases);
+               $aliases = array_diff_key($aliases, array_flip($wgContLang->getNamespaces()));
                $data = array();
                foreach( $aliases as $title => $ns ) {
                        $item = array(