X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=api.php;h=6f4bac39015dd00d88e5678372a931f32fcdc4b4;hb=0974c515c10806f37d9e8e388740ad3a83bd8f5b;hp=9c5ac957160260207b2c292b45a26dfaee75c127;hpb=c004cfc116eb8c677c346f3db561fc3593a8fd99;p=lhc%2Fweb%2Fwiklou.git

diff --git a/api.php b/api.php
index 9c5ac95716..6f4bac3901 100644
--- a/api.php
+++ b/api.php
@@ -31,6 +31,7 @@ use MediaWiki\Logger\LegacyLogger;
 
 // So extensions (and other code) can check whether they're running in API mode
 define( 'MW_API', true );
+define( 'MW_ENTRY_POINT', 'api' );
 
 require __DIR__ . '/includes/WebStart.php';
 
@@ -41,10 +42,10 @@ if ( !$wgRequest->checkUrlExtension() ) {
 	return;
 }
 
-// Pathinfo can be used for stupid things. We don't support it for api.php at
+// PATH_INFO can be used for stupid things. We don't support it for api.php at
 // all, so error out if it's present.
 if ( isset( $_SERVER['PATH_INFO'] ) && $_SERVER['PATH_INFO'] != '' ) {
-	$correctUrl = wfAppendQuery( wfScript( 'api' ), $wgRequest->getQueryValues() );
+	$correctUrl = wfAppendQuery( wfScript( 'api' ), $wgRequest->getQueryValuesOnly() );
 	$correctUrl = wfExpandUrl( $correctUrl, PROTO_CANONICAL );
 	header( "Location: $correctUrl", true, 301 );
 	echo 'This endpoint does not support "path info", i.e. extra text between "api.php"'
@@ -61,10 +62,9 @@ $wgTitle = Title::makeTitle( NS_SPECIAL, 'Badtitle/dummy title for API calls set
 RequestContext::getMain()->setTitle( $wgTitle );
 
 try {
-	/* Construct an ApiMain with the arguments passed via the URL. What we get back
-	 * is some form of an ApiMain, possibly even one that produces an error message,
-	 * but we don't care here, as that is handled by the constructor.
-	 */
+	// Construct an ApiMain with the arguments passed via the URL. What we get back
+	// is some form of an ApiMain, possibly even one that produces an error message,
+	// but we don't care here, as that is handled by the constructor.
 	$processor = new ApiMain( RequestContext::getMain(), true );
 
 	// Last chance hook before executing the API
@@ -72,7 +72,11 @@ try {
 	if ( !$processor instanceof ApiMain ) {
 		throw new MWException( 'ApiBeforeMain hook set $processor to a non-ApiMain class' );
 	}
-} catch ( Exception $e ) {
+} catch ( Exception $e ) { // @todo Remove this block when HHVM is no longer supported
+	// Crap. Try to report the exception in API format to be friendly to clients.
+	ApiMain::handleApiBeforeMainException( $e );
+	$processor = false;
+} catch ( Throwable $e ) {
 	// Crap. Try to report the exception in API format to be friendly to clients.
 	ApiMain::handleApiBeforeMainException( $e );
 	$processor = false;
@@ -99,7 +103,9 @@ if ( $wgAPIRequestLog ) {
 		try {
 			$manager = $processor->getModuleManager();
 			$module = $manager->getModule( $wgRequest->getVal( 'action' ), 'action' );
-		} catch ( Exception $ex ) {
+		} catch ( Exception $ex ) { // @todo Remove this block when HHVM is no longer supported
+			$module = null;
+		} catch ( Throwable $ex ) {
 			$module = null;
 		}
 		if ( !$module || $module->mustBePosted() ) {