From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sat, 21 Aug 2010 08:05:16 +0000 (+0000)
Subject: Fix translated core namespaces broken in r71342.
X-Git-Tag: 1.31.0-rc.0~35417
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=8cdd3034d5ae8a38f74a0897ea61349895adafaa;p=lhc%2Fweb%2Fwiklou.git

Fix translated core namespaces broken in r71342.

The parser tests don't fail anymore (after I was able to run them in the first place)
---

diff --git a/languages/Language.php b/languages/Language.php
index 11094afc5d..cb0af4bf15 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -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 ) {