Partial revert r69231, unrelated and unfinished installer changes

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 4cfe591..510b8c6 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -298,17 +298,15 @@ abstract class Installer {
         * Under the web subclass, it can already be assumed that PHP 5+ is in use 
         * and that sessions are working.
         */
-       function doEnvironmentChecks( $beginCB, $endCB ) {
+       function doEnvironmentChecks() {
                $this->showMessage( 'config-env-php', phpversion() );
 
                $good = true;
                foreach ( $this->envChecks as $check ) {
-                       call_user_func_array( $beginCB, array( $check ) );
                        $status = $this->$check();
                        if ( $status === false ) {
                                $good = false;
                        }
-                       call_user_func_array( $endCB, array( $check, $status ) );
                }
                $this->setVar( '_Environment', $good );
                if ( $good ) {

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index d54602f..96d4842 100644 (file)
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -981,20 +981,12 @@ class WebInstaller_Welcome extends WebInstallerPage {
                }
                $this->parent->output->addWikiText( wfMsgNoTrans( 'config-welcome' ) );
                $status = $this->parent->doEnvironmentChecks();
-               if ( $status->isOk() ) {
+               if ( $status ) {
                        $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright', wfMsg( 'config-authors' ) ) );
                        $this->startForm();
                        $this->endForm();
                }
        }
-
-       public function beginEnvCheck( $step ) {
-
-       }
-
-       public function endEnvCheck( $step, $status ) {
-
-       }
 }
 
 class WebInstaller_DBConnect extends WebInstallerPage {