X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=api.php;h=e55ec75a33523e8fde0a1c19b5a07d6f1408b63a;hb=2345c2319930caf283821262a92a768af870bde2;hp=0d2312a7eabd174fedafd8059fdfff72811d91ab;hpb=55605dfbeea865cacb2299271ddec4716799061d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/api.php b/api.php
index 0d2312a7ea..e55ec75a33 100644
--- a/api.php
+++ b/api.php
@@ -40,7 +40,6 @@ if ( !function_exists( 'version_compare' ) || version_compare( phpversion(), '5.
 	wfPHPVersionError( 'api.php' );
 }
 
-// Initialise common code.
 require __DIR__ . '/includes/WebStart.php';
 
 wfProfileIn( 'api.php' );
@@ -70,10 +69,21 @@ $wgTitle = Title::makeTitle( NS_MAIN, 'API' );
 $processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI );
 
 // Last chance hook before executing the API
-wfRunHooks( 'ApiBeforeMain', array( &$processor ) );
+try {
+	wfRunHooks( 'ApiBeforeMain', array( &$processor ) );
+	if ( !$processor instanceof ApiMain ) {
+		throw new MWException( 'ApiBeforMain hook set $processor to a non-ApiMain class' );
+	}
+} catch ( Exception $e ) {
+	// Crap. Try to report the exception in API format to be friendly to clients.
+	ApiMain::handleApiBeforeMainException( $e );
+	$processor = false;
+}
 
 // Process data & print results
-$processor->execute();
+if ( $processor ) {
+	$processor->execute();
+}
 
 if ( function_exists( 'fastcgi_finish_request' ) ) {
 	fastcgi_finish_request();
@@ -97,11 +107,15 @@ if ( $wgAPIRequestLog ) {
 		$_SERVER['HTTP_USER_AGENT']
 	);
 	$items[] = $wgRequest->wasPosted() ? 'POST' : 'GET';
-	$module = $processor->getModule();
-	if ( $module->mustBePosted() ) {
-		$items[] = "action=" . $wgRequest->getVal( 'action' );
+	if ( $processor ) {
+		$module = $processor->getModule();
+		if ( $module->mustBePosted() ) {
+			$items[] = "action=" . $wgRequest->getVal( 'action' );
+		} else {
+			$items[] = wfArrayToCgi( $wgRequest->getValues() );
+		}
 	} else {
-		$items[] = wfArrayToCgi( $wgRequest->getValues() );
+		$items[] = "failed in ApiBeforeMain";
 	}
 	wfErrorLog( implode( ',', $items ) . "\n", $wgAPIRequestLog );
 	wfDebug( "Logged API request to $wgAPIRequestLog\n" );