From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 16 Feb 2009 11:20:58 +0000 (+0000)
Subject: API: (bug 17502) meta=siteinfo&siprop=namespacealiases no longer lists namespace... 
X-Git-Tag: 1.31.0-rc.0~42879
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=37070d2e5a3bfd0dda1a3f19709cbf4db41b3cea;p=lhc%2Fweb%2Fwiklou.git

API: (bug 17502) meta=siteinfo&siprop=namespacealiases no longer lists namespace aliases already listed in siprop=namespaces
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5bb7bd5923..054a92b97a 100644
--- 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 9a3d7c42ee..7e72a8f0e8 100644
--- 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(