From b8c6a8c646f1b19490bcec38fe48bb72687de192 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Sat, 10 Jul 2010 10:39:30 +0000
Subject: [PATCH] Partial revert r69231, unrelated and unfinished installer
 changes

---
 includes/installer/Installer.php    |  4 +---
 includes/installer/WebInstaller.php | 10 +---------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 4cfe591870..510b8c621e 100644
--- 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 d54602f5ae..96d4842736 100644
--- 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 {
-- 
2.20.1