From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 21 Jan 2011 03:48:00 +0000 (+0000)
Subject: (bug 26762) Fix order of namespace list
X-Git-Tag: 1.31.0-rc.0~32453
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=e854b4a37458f207c3d04d8ed574c7d456398887

(bug 26762) Fix order of namespace list
---

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 3db1938b64..4753aaa411 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -128,12 +128,10 @@ class MWNamespace {
 		static $namespaces = null;
 		if ( $namespaces === null ) {
 			global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
+			$namespaces = array( NS_MAIN => '' ) + $wgCanonicalNamespaceNames;
 			if ( is_array( $wgExtraNamespaces ) ) {
-				$namespaces = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
-			} else {
-				$namespaces = $wgCanonicalNamespaceNames;
+				$namespaces += $wgExtraNamespaces;
 			}
-			$namespaces[NS_MAIN] = '';
 			wfRunHooks( 'CanonicalNamespaces', array( &$namespaces ) );
 		}
 		return $namespaces;