General: Only use _jsonp_wp_die_handler() for JSONP REST API requests.

SergeyBiryukov · SergeyBiryukov · commit ca4765c62c65 · 2021-09-08T17:16:01.000Z
Props mdawaffe, peterwilsoncc. git-svn-id: https://develop.svn.wordpress.org/trunk@51740 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
@@ -3557,9 +3557,9 @@ function wp_die( $message = '', $title = '', $args = array() ) {
 		 * @param callable $function Callback function name.
 		 */
 		$function = apply_filters( 'wp_die_json_handler', '_json_wp_die_handler' );
-	} elseif ( wp_is_jsonp_request() ) {
+	} elseif ( defined( 'REST_REQUEST' ) && REST_REQUEST && wp_is_jsonp_request() ) {
 		/**
-		 * Filters the callback for killing WordPress execution for JSONP requests.
+		 * Filters the callback for killing WordPress execution for JSONP REST requests.
 		 *
 		 * @since 5.2.0
 		 *

Original file line number	Diff line number	Diff line change
`@@ -3557,9 +3557,9 @@ function wp_die( $message = '', $title = '', $args = array() ) {`
`3557`	`3557`	`* @param callable $function Callback function name.`
`3558`	`3558`	`*/`
`3559`	`3559`	`$function = apply_filters( 'wp_die_json_handler', '_json_wp_die_handler' );`
`3560`		`- } elseif ( wp_is_jsonp_request() ) {`
	`3560`	`+ } elseif ( defined( 'REST_REQUEST' ) && REST_REQUEST && wp_is_jsonp_request() ) {`
`3561`	`3561`	`/**`
`3562`		`- * Filters the callback for killing WordPress execution for JSONP requests.`
	`3562`	`+ * Filters the callback for killing WordPress execution for JSONP REST requests.`
`3563`	`3563`	`*`
`3564`	`3564`	`* @since 5.2.0`
`3565`	`3565`	`*`