X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FCliInstaller.php;h=162a978af0b338cc396de29f9517f21064f8b082;hp=d5f0c6713c4780510e783ac9c96c066041f16fea;hb=110f9e3db7ec0a7ac037b9f355092640591770d3;hpb=51995087f101b654e07b3a660b886a455d7a667b

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index d5f0c6713c..162a978af0 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -38,7 +38,6 @@ class CliInstaller extends Installer {
 		'dbpass' => 'wgDBpassword',
 		'dbprefix' => 'wgDBprefix',
 		'dbtableoptions' => 'wgDBTableOptions',
-		'dbmysql5' => 'wgDBmysql5',
 		'dbport' => 'wgDBport',
 		'dbschema' => 'wgDBmwschema',
 		'dbpath' => 'wgSQLiteDataDir',
@@ -73,6 +72,7 @@ class CliInstaller extends Installer {
 			$wgContLang = Language::factory( $option['lang'] );
 			$wgLang = Language::factory( $option['lang'] );
 			$wgLanguageCode = $option['lang'];
+			$this->setVar( 'wgLanguageCode', $wgLanguageCode );
 			RequestContext::getMain()->setLanguage( $wgLang );
 		}
 
@@ -108,8 +108,8 @@ class CliInstaller extends Installer {
 		}
 
 		// Detect and inject any extension found
-		if ( isset( $options['with-extensions'] ) ) {
-			$this->setVar( '_Extensions', array_keys( $installer->findExtensions() ) );
+		if ( isset( $option['with-extensions'] ) ) {
+			$this->setVar( '_Extensions', array_keys( $this->findExtensions() ) );
 		}
 
 		// Set up the default skins