Fix for r79741, setTargetLanguage and setUserLang want an object and string, respecti...

diff --git a/config/index.php b/config/index.php
index 95faba8..0256cfa 100644 (file)
--- 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 2300d57..1a77f4c 100644 (file)
--- 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() );
        }
 
        /**