Redo r47313 in a more readable way (probably more efficient too) by not using all...

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 7e72a8f..27965aa 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -167,10 +167,14 @@ class ApiQuerySiteinfo extends ApiQueryBase {
        protected function appendNamespaceAliases( $property ) {
                global $wgNamespaceAliases, $wgContLang;
                $wgContLang->load();
-               $aliases = array_merge($wgNamespaceAliases, $wgContLang->namespaceAliases);
-               $aliases = array_diff_key($aliases, array_flip($wgContLang->getNamespaces()));
+               $aliases = array_merge( $wgNamespaceAliases, $wgContLang->namespaceAliases );
+               $namespaces = $wgContLang->getNamespaces();
                $data = array();
                foreach( $aliases as $title => $ns ) {
+                       if( $namespaces[$ns] == $title ) {
+                               // Don't list duplicates
+                               continue;
+                       }
                        $item = array(
                                'id' => $ns
                        );