From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 3 May 2013 16:26:25 +0000 (-0700)
Subject: Pass correct number of parameters to Database constructor from installer
X-Git-Tag: 1.31.0-rc.0~19780^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=3f039132f99275188c83730800bb27f3189efc7e;p=lhc%2Fweb%2Fwiklou.git

Pass correct number of parameters to Database constructor from installer

DatabaseBase::__construct() accepts 6 parameters, installer passes 7.

Change-Id: I96d84f645f8f3899d7a99756b441957f1b234de9
---

diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 4436173049..e0bf3d7ee7 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -152,7 +152,6 @@ class MysqlInstaller extends DatabaseInstaller {
 				$this->getVar( '_InstallUser' ),
 				$this->getVar( '_InstallPassword' ),
 				false,
-				false,
 				0,
 				$this->getVar( 'wgDBprefix' )
 			);
@@ -435,7 +434,6 @@ class MysqlInstaller extends DatabaseInstaller {
 					$this->getVar( 'wgDBuser' ),
 					$this->getVar( 'wgDBpassword' ),
 					false,
-					false,
 					0,
 					$this->getVar( 'wgDBprefix' )
 				);
@@ -512,7 +510,6 @@ class MysqlInstaller extends DatabaseInstaller {
 					$dbUser,
 					$password,
 					false,
-					false,
 					0,
 					$this->getVar( 'wgDBprefix' )
 				);