From e854b4a37458f207c3d04d8ed574c7d456398887 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 21 Jan 2011 03:48:00 +0000
Subject: [PATCH] (bug 26762) Fix order of namespace list

---
 includes/Namespace.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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;
-- 
2.20.1