From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- includes/installer/CliInstaller.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'includes/installer/CliInstaller.php') diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index 41392207..f9afbb20 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -24,11 +24,7 @@ class CliInstaller extends Installer { 'dbprefix' => 'wgDBprefix', 'dbtableoptions' => 'wgDBTableOptions', 'dbmysql5' => 'wgDBmysql5', - 'dbserver' => 'wgDBserver', 'dbport' => 'wgDBport', - 'dbname' => 'wgDBname', - 'dbuser' => 'wgDBuser', - 'dbpass' => 'wgDBpassword', 'dbschema' => 'wgDBmwschema', 'dbpath' => 'wgSQLiteDataDir', 'server' => 'wgServer', @@ -88,6 +84,9 @@ class CliInstaller extends Installer { $option['installdbuser'] ); $this->setVar( '_InstallPassword', isset( $option['installdbpass'] ) ? $option['installdbpass'] : "" ); + + // Assume that if we're given the installer user, we'll create the account. + $this->setVar( '_CreateDBAccount', true ); } if ( isset( $option['pass'] ) ) { @@ -184,11 +183,8 @@ class CliInstaller extends Installer { return parent::envCheckPath(); } - protected function envCheckServer( $srv = null ) { - if ( $this->getVar( 'wgServer' ) ) { - $srv = $this->getVar( 'wgServer' ); - } - return parent::envCheckServer( $srv ); + protected function envGetDefaultServer() { + return $this->getVar( 'wgServer' ); } public function dirIsExecutable( $dir, $url ) { -- cgit v1.2.3-54-g00ecf