From 8fed0eb24192d04cbfa7f98606f7d08816babda4 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 23 Dec 2010 20:24:11 +0000 Subject: [PATCH] * Fix r78774 for Oracle and Postgres, broke by method rename * Get rid of Postgres version check, already handled by PostgresInstaller::submitConnectForm() --- includes/db/DatabasePostgres.php | 9 --------- includes/installer/OracleInstaller.php | 2 +- includes/installer/PostgresInstaller.php | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index 96f7eaea9e..dff73e9d67 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -229,15 +229,6 @@ class DatabasePostgres extends DatabaseBase { // If this is the initial connection, setup the schema stuff and possibly create the user global $wgDBname, $wgDBuser, $wgDBpassword, $wgDBmwschema, $wgDBts2schema; - print '
  • Checking the version of Postgres...'; - $version = $this->getServerVersion(); - $PGMINVER = '8.1'; - if ( $version < $PGMINVER ) { - print "FAILED. Required version is $PGMINVER. You have " . htmlspecialchars( $version ) . "
    • \n"; - dieout( ); - } - print 'version ' . htmlspecialchars( $this->numeric_version ) . " is OK.\n"; - $safeuser = $this->addIdentifierQuotes( $wgDBuser ); // Are we connecting as a superuser for the first time? if ( $superuser ) { diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 4a1d724bd2..2f1dad7561 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -152,7 +152,7 @@ class OracleInstaller extends DatabaseInstaller { 'callback' => array( $this, 'setupUser' ), ) ); - $this->parent->addInstallStepFollowing( "database", $callback ); + $this->parent->addInstallStep( $callback, 'database' ); } diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index 72e94e9e22..aa9d68b95a 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -113,7 +113,7 @@ class PostgresInstaller extends DatabaseInstaller { 'name' => 'pg-commit', 'callback' => array( $this, 'commitChanges' ), ); - $this->parent->addInstallStepFollowing( 'interwiki', $callback ); + $this->parent->addInstallStep( $callback, 'interwiki' ); } function setupDatabase() { -- 2.20.1