From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Wed, 7 Jul 2010 13:39:57 +0000 (+0000)
Subject: * use call_user_func instead of $class::isCompiled() for php 5.2 (re r69128)
X-Git-Tag: 1.31.0-rc.0~36225
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=b56235a5776e40036573051aa98cf3784d7a9940;p=lhc%2Fweb%2Fwiklou.git

* use call_user_func instead of $class::isCompiled() for php 5.2 (re r69128)
* in performInstallation, $step is always a string, check $stepObj instead
* remove installUser() method that only called setupUser, which only MySQL needs and is added by modifying the steps
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 5efdc0c5ab..7c44ddbb8e 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -282,7 +282,7 @@ abstract class Installer {
 
 		if ( !isset( $this->dbInstallers[$type] ) ) {
 			$class = ucfirst( $type ). 'Installer';
-			if ($class::isCompiled()) {
+			if ( call_user_func( array( $class, 'isCompiled' ) ) ) {
 				$this->dbInstallers[$type] = new $class( $this );
 			} else {
 				$this->dbInstallers[$type] = false;
@@ -873,7 +873,7 @@ abstract class Installer {
 			$status = null;
 
 			# Call our working function
-			if ( is_array( $step ) ) {
+			if ( is_array( $stepObj ) ) {
 				# A custom callaback
 				$callback = $stepObj['callback'];
 				$status = call_user_func_array( $callback, array() );
@@ -914,12 +914,6 @@ abstract class Installer {
 		return $status;
 	}
 
-	public function installUser() {
-		$installer = $this->getDBInstaller( $this->getVar( 'wgDBtype' ) );
-		$status = $installer->setupUser();
-		return $status;
-	}
-
 	public function installTables() {
 		$installer = $this->getDBInstaller();
 		$status = $installer->createTables();