diff options
Diffstat (limited to 'includes/api/ApiFormatJson.php')
| -rw-r--r-- | includes/api/ApiFormatJson.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php index 43877b78..be1b12c3 100644 --- a/includes/api/ApiFormatJson.php +++ b/includes/api/ApiFormatJson.php @@ -35,6 +35,15 @@ class ApiFormatJson extends ApiFormatBase { public function __construct( ApiMain $main, $format ) { parent::__construct( $main, $format ); $this->isRaw = ( $format === 'rawfm' ); + + if ( $this->getMain()->getCheck( 'callback' ) ) { + # T94015: jQuery appends a useless '_' parameter in jsonp mode. + # Mark the parameter as used in that case to avoid a warning that's + # outside the control of the end user. + # (and do it here because ApiMain::reportUnusedParams() gets called + # before our ::execute()) + $this->getMain()->getCheck( '_' ); + } } public function getMimeType() { @@ -50,13 +59,6 @@ class ApiFormatJson extends ApiFormatBase { /** * @deprecated since 1.25 */ - public function getNeedsRawData() { - return $this->isRaw; - } - - /** - * @deprecated since 1.25 - */ public function getWantsHelp() { wfDeprecated( __METHOD__, '1.25' ); // Help is always ugly in JSON |