From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sat, 19 Feb 2011 08:01:45 +0000 (+0000)
Subject: Bug 27053 - sourceFile() didn't expand all the required variables. Apparently, broken... 
X-Git-Tag: 1.31.0-rc.0~31903
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=3a6d2c0ea4118b4d8b37695f02d6bc64f4591917;p=lhc%2Fweb%2Fwiklou.git

Bug 27053 - sourceFile() didn't expand all the required variables. Apparently, broken by r81084
---

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 938d59f878..cb02a2d24b 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -430,8 +430,8 @@ class MysqlInstaller extends DatabaseInstaller {
 			return $status;
 		}
 
-		$db = $this->getVar( 'wgDBname' );
 		$this->db->selectDB( $db );
+		$this->setupSchemaVars();
 		$error = $this->db->sourceFile( "$IP/maintenance/users.sql" );
 		if ( $error !== true ) {
 			$status->fatal( 'config-install-user-failed', $this->getVar( 'wgDBuser' ), $error );
@@ -463,6 +463,9 @@ class MysqlInstaller extends DatabaseInstaller {
 	public function getSchemaVars() {
 		return array(
 			'wgDBTableOptions' => $this->getTableOptions(),
+			'wgDBname' => $this->getVar( 'wgDBname' ),
+			'wgDBuser' => $this->getVar( 'wgDBuser' ),
+			'wgDBpassword' => $this->getVar( 'wgDBpassword' ),
 		);
 	}