From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Sun, 29 Aug 2010 03:08:15 +0000 (+0000)
Subject: Unmerging r71867. Merge-conflicts with some things Nikerabbit was doing. He broke... 
X-Git-Tag: 1.31.0-rc.0~35284
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=2c50a8b9aa5f1a4ba636982b159e64fe61c0845f;p=lhc%2Fweb%2Fwiklou.git

Unmerging r71867. Merge-conflicts with some things Nikerabbit was doing. He broke it, leaving him to fix it for now :-)
---

diff --git a/languages/Language.php b/languages/Language.php
index a5b66282dc..71793e20bf 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -262,8 +262,6 @@ class Language {
 			}
 			
 			# Sometimes a language will be localised but not actually exist on this wiki.
-			global $wgCanonicalNamespaceNames;
-			$validNamespaces = array_keys(MWNamespace::getCanonicalNamespaces());
 			foreach( $this->namespaceNames as $key => $text ) {
 				if ( !isset( $validNamespaces[$key] ) ) {
 					unset( $this->namespaceNames[$key] );