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

diff --git a/languages/Language.php b/languages/Language.php
index 3056143..949ff71 100644 (file)
--- 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] );