From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 17 Dec 2015 09:15:42 +0100 Subject: Update to MediaWiki 1.26.0 --- includes/api/ApiFormatJson.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'includes/api/ApiFormatJson.php') 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() { @@ -47,13 +56,6 @@ class ApiFormatJson extends ApiFormatBase { return 'application/json'; } - /** - * @deprecated since 1.25 - */ - public function getNeedsRawData() { - return $this->isRaw; - } - /** * @deprecated since 1.25 */ -- cgit v1.2.3-54-g00ecf