Unmerging r71867. Merge-conflicts with some things Nikerabbit was doing. He broke...

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