From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Fri, 20 Aug 2010 16:28:02 +0000 (+0000)
Subject: Missing else condition was breaking namespaces for everyone else but me. Followup... 
X-Git-Tag: 1.31.0-rc.0~35426
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/?a=commitdiff_plain;h=aa383d282d196de385b55aab7ed26d29a93e3bc4;p=lhc%2Fweb%2Fwiklou.git

Missing else condition was breaking namespaces for everyone else but me. Followup r71342
---

diff --git a/includes/Namespace.php b/includes/Namespace.php
index 8d44dd880a..08a943c5d2 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -131,6 +131,8 @@ class MWNamespace {
 			global $wgExtraNamespaces, $wgCanonicalNamespaceNames;
 			if ( is_array( $wgExtraNamespaces ) ) {
 				$namespaces = $wgCanonicalNamespaceNames + $wgExtraNamespaces;
+			} else {
+				$namespaces = $wgCanonicalNamespaceNames;
 			}
 			$namespaces[NS_MAIN] = '';
 		}