From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Thu, 9 Jun 2011 15:42:23 +0000 (+0000)
Subject: MFT r89770
X-Git-Tag: 1.31.0-rc.0~29609
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=c719d1a2e3a4887b2a6b0630378bba0179251371;p=lhc%2Fweb%2Fwiklou.git

MFT r89770
---

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 7aebc10753..ccabedb586 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -77,6 +77,11 @@ class CliInstaller extends Installer {
 				$this->getVar( 'wgDBuser' ) );
 			$this->setVar( '_InstallPassword',
 				$this->getVar( 'wgDBpassword' ) );
+		} else {
+			$this->setVar( '_InstallUser',
+				$option['installdbuser'] );
+			$this->setVar( '_InstallPassword',
+				$option['installdbpass'] );
 		}
 
 		if ( isset( $option['pass'] ) ) {