(bug 26762) Fix order of namespace list

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 3db1938..4753aaa 100644 (file)
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -128,12 +128,10 @@ class MWNamespace {
                static $namespaces = null;
                if ( $namespaces === null ) {
                        global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
                static $namespaces = null;
                if ( $namespaces === null ) {
                        global $wgExtraNamespaces, $wgCanonicalNamespaceNames;

+                       $namespaces = array( NS_MAIN => '' ) + $wgCanonicalNamespaceNames;

                        if ( is_array( $wgExtraNamespaces ) ) {
                        if ( is_array( $wgExtraNamespaces ) ) {

-                               $namespaces = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
-                       } else {
-                               $namespaces = $wgCanonicalNamespaceNames;
+                               $namespaces += $wgExtraNamespaces;

                        }
                        }

-                       $namespaces[NS_MAIN] = '';

                        wfRunHooks( 'CanonicalNamespaces', array( &$namespaces ) );
                }
                return $namespaces;
                        wfRunHooks( 'CanonicalNamespaces', array( &$namespaces ) );
                }
                return $namespaces;