X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FPHPVersionError.php;h=0f5a6fc087877cf23678fccbddcf8afeb9a44137;hb=72462041c030caa32a71f579d1e1d8c165da01de;hp=9b5373b50902ecb7d66e8255c422f9ecfa674b7d;hpb=543723c79254c66f6b6c6e387aa4fc326a697f0e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/PHPVersionError.php b/includes/PHPVersionError.php
index 9b5373b509..0f5a6fc087 100644
--- a/includes/PHPVersionError.php
+++ b/includes/PHPVersionError.php
@@ -32,6 +32,7 @@
  *   - index.php
  *   - load.php
  *   - api.php
+ *   - mw-config/index.php
  *   - cli
  *
  * @note Since we can't rely on anything, the minimum PHP versions and MW current
@@ -41,16 +42,24 @@ function wfPHPVersionError( $type ) {
 	$mwVersion = '1.24';
 	$minimumVersionPHP = '5.3.2';
 
-	$phpVersion = phpversion();
+	$phpVersion = PHP_VERSION;
 	$protocol = isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
-	$message = "MediaWiki $mwVersion requires at least PHP version $minimumVersionPHP, you are using PHP $phpVersion.";
+	$message = "MediaWiki $mwVersion requires at least "
+		. "PHP version $minimumVersionPHP, you are using PHP $phpVersion.";
+
 	if ( $type == 'cli' ) {
-		$finalOutput = "You are using PHP version $phpVersion but MediaWiki $mwVersion needs PHP $minimumVersionPHP or higher. ABORTING.\n" .
-		"Check if you have a newer php executable with a different name, such as php5.\n";
-	} elseif ( $type == 'index.php' ) {
+		$finalOutput = "You are using PHP version $phpVersion "
+			. "but MediaWiki $mwVersion needs PHP $minimumVersionPHP or higher. ABORTING.\n"
+			. "Check if you have a newer php executable with a different name, such as php5.\n";
+	} elseif ( $type == 'index.php' || $type == 'mw-config/index.php' ) {
 		$pathinfo = pathinfo( $_SERVER['SCRIPT_NAME'] );
+		if ( $type == 'mw-config/index.php' ) {
+			$dirname = dirname( $pathinfo['dirname'] );
+		} else {
+			$dirname = $pathinfo['dirname'];
+		}
 		$encLogo = htmlspecialchars(
-			str_replace( '//', '/', $pathinfo['dirname'] . '/' ) .
+			str_replace( '//', '/', $dirname . '/' ) .
 			'skins/common/images/mediawiki.png'
 		);