| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -981,20 +981,12 @@ |
| 982 | 982 | } |
| 983 | 983 | $this->parent->output->addWikiText( wfMsgNoTrans( 'config-welcome' ) ); |
| 984 | 984 | $status = $this->parent->doEnvironmentChecks(); |
| 985 | | - if ( $status->isOk() ) { |
| | 985 | + if ( $status ) { |
| 986 | 986 | $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright', wfMsg( 'config-authors' ) ) ); |
| 987 | 987 | $this->startForm(); |
| 988 | 988 | $this->endForm(); |
| 989 | 989 | } |
| 990 | 990 | } |
| 991 | | - |
| 992 | | - public function beginEnvCheck( $step ) { |
| 993 | | - |
| 994 | | - } |
| 995 | | - |
| 996 | | - public function endEnvCheck( $step, $status ) { |
| 997 | | - |
| 998 | | - } |
| 999 | 991 | } |
| 1000 | 992 | |
| 1001 | 993 | class WebInstaller_DBConnect extends WebInstallerPage { |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -298,17 +298,15 @@ |
| 299 | 299 | * Under the web subclass, it can already be assumed that PHP 5+ is in use |
| 300 | 300 | * and that sessions are working. |
| 301 | 301 | */ |
| 302 | | - function doEnvironmentChecks( $beginCB, $endCB ) { |
| | 302 | + function doEnvironmentChecks() { |
| 303 | 303 | $this->showMessage( 'config-env-php', phpversion() ); |
| 304 | 304 | |
| 305 | 305 | $good = true; |
| 306 | 306 | foreach ( $this->envChecks as $check ) { |
| 307 | | - call_user_func_array( $beginCB, array( $check ) ); |
| 308 | 307 | $status = $this->$check(); |
| 309 | 308 | if ( $status === false ) { |
| 310 | 309 | $good = false; |
| 311 | 310 | } |
| 312 | | - call_user_func_array( $endCB, array( $check, $status ) ); |
| 313 | 311 | } |
| 314 | 312 | $this->setVar( '_Environment', $good ); |
| 315 | 313 | if ( $good ) { |