From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 23 Dec 2010 20:24:11 +0000 (+0000)
Subject: * Fix r78774 for Oracle and Postgres, broke by method rename
X-Git-Tag: 1.31.0-rc.0~33134
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=8fed0eb24192d04cbfa7f98606f7d08816babda4;p=lhc%2Fweb%2Fwiklou.git

* 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 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 '<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 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() {