X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FCliInstaller.php;h=0b024c41d352e2f871523237ba54aec9777300d4;hp=32d263495911072062b5254b4e4098752b2e985c;hb=4187f85473958bd6560d48c8891511e2f9bcf1d4;hpb=c05926bc7ce57cbea42e90053ef799fa58b9da1e

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 32d2634959..0b024c41d3 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 );
 		}
 
@@ -107,6 +107,11 @@ class CliInstaller extends Installer {
 			$this->setVar( '_AdminPassword', $option['pass'] );
 		}
 
+		// Detect and inject any extension found
+		if ( isset( $option['with-extensions'] ) ) {
+			$this->setVar( '_Extensions', array_keys( $this->findExtensions() ) );
+		}
+
 		// Set up the default skins
 		$skins = array_keys( $this->findExtensions( 'skins' ) );
 		$this->setVar( '_Skins', $skins );
@@ -121,6 +126,15 @@ class CliInstaller extends Installer {
 	 * Main entry point.
 	 */
 	public function execute() {
+		// If APC is available, use that as the MainCacheType, instead of nothing.
+		// This is hacky and should be consolidated with WebInstallerOptions.
+		// This is here instead of in __construct(), because it should run run after
+		// doEnvironmentChecks(), which populates '_Caches'.
+		if ( count( $this->getVar( '_Caches' ) ) ) {
+			// We detected a CACHE_ACCEL implementation, use it.
+			$this->setVar( '_MainCacheType', 'accel' );
+		}
+
 		$vars = Installer::getExistingLocalSettings();
 		if ( $vars ) {
 			$this->showStatusMessage(