Fix translated core namespaces broken in r71342.
authorNiklas Laxström <nikerabbit@users.mediawiki.org>
Sat, 21 Aug 2010 08:05:16 +0000 (08:05 +0000)
committerNiklas Laxström <nikerabbit@users.mediawiki.org>
Sat, 21 Aug 2010 08:05:16 +0000 (08:05 +0000)
The parser tests don't fail anymore (after I was able to run them in the first place)

languages/Language.php

index 11094af..cb0af4b 100644 (file)
@@ -245,12 +245,12 @@ class Language {
         */
        function getNamespaces() {
                if ( is_null( $this->namespaceNames ) ) {
-                       global $wgMetaNamespace, $wgMetaNamespaceTalk;
+                       global $wgMetaNamespace, $wgMetaNamespaceTalk, $wgExtraNamespaces;
 
                        $this->namespaceNames = self::$dataCache->getItem( $this->mCode, 'namespaceNames' );
                        $validNamespaces = MWNamespace::getCanonicalNamespaces();
 
-                       $this->namespaceNames = $validNamespaces + $this->namespaceNames;
+                       $this->namespaceNames = $wgExtraNamespaces + $this->namespaceNames + $validNamespaces;
 
                        $this->namespaceNames[NS_PROJECT] = $wgMetaNamespace;
                        if ( $wgMetaNamespaceTalk ) {