Index: trunk/phase3/includes/db/DatabasePostgres.php |
— | — | @@ -229,15 +229,6 @@ |
230 | 230 | // If this is the initial connection, setup the schema stuff and possibly create the user |
231 | 231 | global $wgDBname, $wgDBuser, $wgDBpassword, $wgDBmwschema, $wgDBts2schema; |
232 | 232 | |
233 | | - print '<li>Checking the version of Postgres...'; |
234 | | - $version = $this->getServerVersion(); |
235 | | - $PGMINVER = '8.1'; |
236 | | - if ( $version < $PGMINVER ) { |
237 | | - print "<b>FAILED</b>. Required version is $PGMINVER. You have " . htmlspecialchars( $version ) . "</li>\n"; |
238 | | - dieout( ); |
239 | | - } |
240 | | - print 'version ' . htmlspecialchars( $this->numeric_version ) . " is OK.</li>\n"; |
241 | | - |
242 | 233 | $safeuser = $this->addIdentifierQuotes( $wgDBuser ); |
243 | 234 | // Are we connecting as a superuser for the first time? |
244 | 235 | if ( $superuser ) { |
Index: trunk/phase3/includes/installer/OracleInstaller.php |
— | — | @@ -152,7 +152,7 @@ |
153 | 153 | 'callback' => array( $this, 'setupUser' ), |
154 | 154 | ) |
155 | 155 | ); |
156 | | - $this->parent->addInstallStepFollowing( "database", $callback ); |
| 156 | + $this->parent->addInstallStep( $callback, 'database' ); |
157 | 157 | } |
158 | 158 | |
159 | 159 | |
Index: trunk/phase3/includes/installer/PostgresInstaller.php |
— | — | @@ -113,7 +113,7 @@ |
114 | 114 | 'name' => 'pg-commit', |
115 | 115 | 'callback' => array( $this, 'commitChanges' ), |
116 | 116 | ); |
117 | | - $this->parent->addInstallStepFollowing( 'interwiki', $callback ); |
| 117 | + $this->parent->addInstallStep( $callback, 'interwiki' ); |
118 | 118 | } |
119 | 119 | |
120 | 120 | function setupDatabase() { |