X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=api.php;h=7aef1eb9921ce84e262ca68954edb4d7a89e900e;hb=57ec7a98780ab5bdb257c9b14663f0f522fe3d9a;hp=7fff04803aad8d3fed26e4500dd7f6a9503a0812;hpb=97ff30ddb42219931ebeac2ecbc2a940acf356b8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/api.php b/api.php
index 7fff04803a..7aef1eb992 100644
--- a/api.php
+++ b/api.php
@@ -37,17 +37,10 @@
 // So extensions (and other code) can check whether they're running in API mode
 define( 'MW_API', true );
 
-// We want a plain message on catastrophic errors that machines can identify
-function wfDie( $msg = '' ) {
-	header( $_SERVER['SERVER_PROTOCOL'] . ' 500 MediaWiki configuration Error', true, 500 );
-	echo $msg;
-	die( 1 );
-}
-
-// Die on unsupported PHP versions
-if( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.2.3' ) < 0 ){
-	$version = htmlspecialchars( $wgVersion );
-	wfDie( "MediaWiki $version requires at least PHP version 5.2.3." );
+// Bail if PHP is too low
+if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.2.3' ) < 0 ) {
+	require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' );
+	wfPHPVersionError( 'api.php' );
 }
 
 // Initialise common code.
@@ -67,9 +60,10 @@ if ( !$wgRequest->checkUrlExtension() ) {
 
 // Verify that the API has not been disabled
 if ( !$wgEnableAPI ) {
-	wfDie( 'MediaWiki API is not enabled for this site. Add the following line to your LocalSettings.php'
-		. '<pre><b>$wgEnableAPI=true;</b></pre>'
-	);
+	header( $_SERVER['SERVER_PROTOCOL'] . ' 500 MediaWiki configuration Error', true, 500 );
+	echo( 'MediaWiki API is not enabled for this site. Add the following line to your LocalSettings.php'
+		. '<pre><b>$wgEnableAPI=true;</b></pre>' );
+	die(1);
 }
 
 // Selectively allow cross-site AJAX
@@ -133,7 +127,7 @@ if ( $wgAPIRequestLog ) {
 	$items = array(
 			wfTimestamp( TS_MW ),
 			$endtime - $starttime,
-			wfGetIP(),
+			$wgRequest->getIP(),
 			$_SERVER['HTTP_USER_AGENT']
 	);
 	$items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';