X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=api.php;h=9cf75787ba1a387cfa4dd0699d0aa4e48c12d3f4;hp=9c5ac957160260207b2c292b45a26dfaee75c127;hb=58f810a0dceb346b127fd0030be3922e05d8fdee;hpb=733993fa54ecd9d55e52c88ed44be343b9a8abed

diff --git a/api.php b/api.php
index 9c5ac95716..9cf75787ba 100644
--- a/api.php
+++ b/api.php
@@ -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() ) {