From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Fri, 20 Aug 2010 06:19:37 +0000 (+0000)
Subject: Apply hack from 1.16wmf4 in r71329 to trunk (follow-up to r71327). The version in... 
X-Git-Tag: 1.31.0-rc.0~35436
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=d67ab7f70ff420268de07b83f74bbf4e727e9fda;p=lhc%2Fweb%2Fwiklou.git

Apply hack from 1.16wmf4 in r71329 to trunk (follow-up to r71327). The version in r71327 breaks special pages.
---

diff --git a/languages/Language.php b/languages/Language.php
index 30561437b4..949ff71e82 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -258,7 +258,9 @@ class Language {
 			}
 			
 			# Sometimes a language will be localised but not actually exist on this wiki.
-			$validNamespaces = MWNamespace::getValidNamespaces();
+			global $wgCanonicalNamespaceNames;
+			$validNamespaces = array_keys($wgCanonicalNamespaceNames);
+			$validNamespaces[] = NS_MAIN;
 			foreach( $this->namespaceNames as $key => $text ) {
 			        if ( ! in_array( $key, $validNamespaces ) ) {
 			                unset( $this->namespaceNames[$key] );