X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=api.php;h=abf601fb48c1124d6f4505949cb77ac9efedf8c2;hb=f74897584c5e592fd0861e3e8d05c4be7ed2d453;hp=9e1f5dd334e9404688904ee6c64c865b0a6d0db0;hpb=4736034866f3c1cbda172943348fc396e9a54726;p=lhc%2Fweb%2Fwiklou.git diff --git a/api.php b/api.php index 9e1f5dd334..abf601fb48 100644 --- a/api.php +++ b/api.php @@ -35,6 +35,7 @@ define( 'MW_API', true ); // Bail if PHP is too low if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.3.2' ) < 0 ) { + // We need to use dirname( __FILE__ ) here cause __DIR__ is PHP5.3+ require( dirname( __FILE__ ) . '/includes/PHPVersionError.php' ); wfPHPVersionError( 'api.php' ); } @@ -43,7 +44,7 @@ if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5. if ( isset( $_SERVER['MW_COMPILED'] ) ) { require ( 'core/includes/WebStart.php' ); } else { - require ( dirname( __FILE__ ) . '/includes/WebStart.php' ); + require ( __DIR__ . '/includes/WebStart.php' ); } wfProfileIn( 'api.php' ); @@ -59,7 +60,7 @@ if ( !$wgEnableAPI ) { 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' . '
$wgEnableAPI=true;
' ); - die(1); + die( 1 ); } // Set a dummy $wgTitle, because $wgTitle == null breaks various things @@ -86,17 +87,17 @@ wfLogProfilingData(); // Log the request if ( $wgAPIRequestLog ) { $items = array( - wfTimestamp( TS_MW ), - $endtime - $starttime, - $wgRequest->getIP(), - $_SERVER['HTTP_USER_AGENT'] + wfTimestamp( TS_MW ), + $endtime - $starttime, + $wgRequest->getIP(), + $_SERVER['HTTP_USER_AGENT'] ); $items[] = $wgRequest->wasPosted() ? 'POST' : 'GET'; $module = $processor->getModule(); if ( $module->mustBePosted() ) { $items[] = "action=" . $wgRequest->getVal( 'action' ); } else { - $items[] = wfArrayToCGI( $wgRequest->getValues() ); + $items[] = wfArrayToCgi( $wgRequest->getValues() ); } wfErrorLog( implode( ',', $items ) . "\n", $wgAPIRequestLog ); wfDebug( "Logged API request to $wgAPIRequestLog\n" ); @@ -106,4 +107,3 @@ if ( $wgAPIRequestLog ) { // get here to worry about whether this should be = or =&, but the file has to parse properly. $lb = wfGetLBFactory(); $lb->shutdown(); -