From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 12 Jan 2011 08:53:56 +0000 (+0000)
Subject: Fix for r79741, setTargetLanguage and setUserLang want an object and string, respecti... 
X-Git-Tag: 1.31.0-rc.0~32601
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=63dd7d5a4f5daeeb85ff148db7c0bcd8f62d3155;p=lhc%2Fweb%2Fwiklou.git

Fix for r79741, setTargetLanguage and setUserLang want an object and string, respectively. Fixes bug 26686
---

diff --git a/config/index.php b/config/index.php
index 95faba8801..0256cfac96 100644
--- a/config/index.php
+++ b/config/index.php
@@ -39,7 +39,7 @@ function wfInstallerMain() {
 	}
 	$wgLang = Language::factory( $langCode );
 
-	$installer->setParserLanguage( $wgLang->getCode() );
+	$installer->setParserLanguage( $wgLang );
 
 	$wgMetaNamespace = $wgCanonicalNamespaceNames[NS_PROJECT];
 
diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php
index 2300d5792f..1a77f4c72f 100644
--- a/includes/installer/CoreInstaller.php
+++ b/includes/installer/CoreInstaller.php
@@ -263,7 +263,7 @@ abstract class CoreInstaller extends Installer {
 	 */
 	public function setParserLanguage( $lang ) {
 		$this->parserOptions->setTargetLanguage( $lang );
-		$this->parserOptions->setUserLang( $lang );
+		$this->parserOptions->setUserLang( $lang->getCode() );
 	}
 
 	/**