X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiFormatPhp.php;h=a744f57becf1d07a99429b529355fe456fd33935;hp=fc25f47723906e8392c171481f67d7156c24d32e;hb=ce079cf6ad79ca8d3360817f809b219d166f9153;hpb=9a309c92e6f1346cb503a42e30dbbb6982c79671 diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php index fc25f47723..a744f57bec 100644 --- a/includes/api/ApiFormatPhp.php +++ b/includes/api/ApiFormatPhp.php @@ -55,7 +55,8 @@ class ApiFormatPhp extends ApiFormatBase { break; default: - $this->dieUsage( __METHOD__ . ': Unknown value for \'formatversion\'', 'unknownformatversion' ); + // Should have been caught during parameter validation + $this->dieDebug( __METHOD__, 'Unknown value for \'formatversion\'' ); } $text = serialize( $this->getResult()->getResultData( null, $transforms ) ); @@ -67,11 +68,7 @@ class ApiFormatPhp extends ApiFormatBase { in_array( 'wfOutputHandler', ob_list_handlers(), true ) && preg_match( '/\<\s*cross-domain-policy(?=\s|\>)/i', $text ) ) { - $this->dieUsage( - 'This response cannot be represented using format=php. ' . - 'See https://phabricator.wikimedia.org/T68776', - 'internalerror' - ); + $this->dieWithError( 'apierror-formatphp', 'internalerror' ); } $this->printText( $text );