* Fix r78774 for Oracle and Postgres, broke by method rename

* Get rid of Postgres version check, already handled by PostgresInstaller::submitConnectForm()

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 96f7eae..dff73e9 100644 (file)
--- 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 '<li>Checking the version of Postgres...';
-               $version = $this->getServerVersion();
-               $PGMINVER = '8.1';
-               if ( $version < $PGMINVER ) {
-                       print "<b>FAILED</b>. Required version is $PGMINVER. You have " . htmlspecialchars( $version ) . "</li>\n";
-                       dieout( );
-               }
-               print 'version ' . htmlspecialchars( $this->numeric_version ) . " is OK.</li>\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 4a1d724..2f1dad7 100644 (file)
--- 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 72e94e9..aa9d68b 100644 (file)
--- 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() {