From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 20 Apr 2015 14:12:39 +0000 (-0400)
Subject: API: Avoid warnings for parameters that don't exist in format=rawfm
X-Git-Tag: 1.31.0-rc.0~11657
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=db6a9636f1aa75e7cfea364ce83169f53a73c326;p=lhc%2Fweb%2Fwiklou.git

API: Avoid warnings for parameters that don't exist in format=rawfm

As format=rawfm is intended for debugging, a recent change removed
definition of unnecessary parameters inherited from format=json. But the
inherited code was still assuming they were defined, causing PHP
warnings.

Bug: T96479
Change-Id: Id13ae541f13b6930c535d156dc5aac0a257d31e8
---

diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 41d70518e8..3304c4031e 100644
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -40,7 +40,7 @@ class ApiFormatJson extends ApiFormatBase {
 	public function getMimeType() {
 		$params = $this->extractRequestParams();
 		// callback:
-		if ( $params['callback'] ) {
+		if ( isset( $params['callback'] ) ) {
 			return 'text/javascript';
 		}
 
@@ -106,9 +106,8 @@ class ApiFormatJson extends ApiFormatBase {
 			);
 		}
 
-		$callback = $params['callback'];
-		if ( $callback !== null ) {
-			$callback = preg_replace( "/[^][.\\'\\\"_A-Za-z0-9]/", '', $callback );
+		if ( isset( $params['callback'] ) ) {
+			$callback = preg_replace( "/[^][.\\'\\\"_A-Za-z0-9]/", '', $params['callback'] );
 			# Prepend a comment to try to avoid attacks against content
 			# sniffers, such as bug 68187.
 			$this->printText( "/**/$callback($json)" );