From 63dd7d5a4f5daeeb85ff148db7c0bcd8f62d3155 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 12 Jan 2011 08:53:56 +0000 Subject: [PATCH] Fix for r79741, setTargetLanguage and setUserLang want an object and string, respectively. Fixes bug 26686 --- config/index.php | 2 +- includes/installer/CoreInstaller.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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() ); } /** -- 2.20.1