Ticket #46025: 46025.4.diff

src/wp-includes/functions.php

@@ -2989 +2989 @@
                  * @param callable $function Callback function name.
                  */
                 $function = apply_filters( 'wp_die_json_handler', '_json_wp_die_handler' );
+        } elseif ( wp_is_jsonp_request() ) {
+                /**
+                 * Filters the callback for killing WordPress execution for JSONP requests.
+                 *
+                 * @since 5.1.0
+                 *
+                 * @param callable $function Callback function name.
+                 */
+                $function = apply_filters( 'wp_die_jsonp_handler', '_jsonp_wp_die_handler' );
         } elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
                 /**
                  * Filters the callback for killing WordPress execution for XML-RPC requests.
@@ -4271 +4280 @@
         <?php
         die();
 }
+
+/**
+ * Kill WordPress execution and display JSONP message with error message.
+ *
+ * This is the handler for wp_die when processing JSONP requests.
+ *
+ * @since 5.1.0
+ * @access private
+ *
+ * @param string       $message Error message.
+ * @param string       $title   Optional. Error title. Default empty.
+ * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
+ */
+function _jsonp_wp_die_handler( $message, $title = '', $args = array() ) {
+        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+
+        $data = array(
+                'code'              => $r['code'],
+                'message'           => $message,
+                'data'              => array(
+                        'status' => $r['response'],
+                ),
+                'additional_errors' => $r['additional_errors'],
+        );
+
+        if ( ! headers_sent() ) {
+                header( 'Content-Type: application/javascript; charset=utf-8' );
+                header( 'X-Content-Type-Options: nosniff' );
+                header( 'X-Robots-Tag: noindex' );
+                if ( null !== $r['response'] ) {
+                        status_header( $r['response'] );
+                }
+                nocache_headers();
+        }
+
+        $result         = wp_json_encode( $data );
+        $jsonp_callback = $_GET['_jsonp'];
+        echo '/**/' . $jsonp_callback . '(' . $result . ')';
+        if ( $r['exit'] ) {
+                die();
+        }
+}
 
 /**
  * Convert a value to non-negative integer.

src/wp-includes/load.php

@@ -1488 +1488 @@
         return false;
 
 }
+
+
+/**
+ * Checks whether current request is a JSONP request, or is expecting a JSONP response.
+ *
+ * @since 5.1.0
+ *
+ * @return bool True if JSONP Request
+ */
+function wp_is_jsonp_request() {
+        if ( ! isset( $_GET['_jsonp'] ) ) {
+                return false;
+        }
+
+        if ( ! function_exists( 'wp_check_jsonp_callback' ) ) {
+                require_once ABSPATH . WPINC . '/functions.php';
+        }
+
+        $jsonp_callback = $_GET['_jsonp'];
+        if ( ! wp_check_jsonp_callback( $jsonp_callback ) ) {
+                return false;
+        }
+
+        $jsonp_enabled = true;
+        /** This filter is documented in wp-includes/rest-api/class-wp-rest-server.php */
+        $jsonp_enabled = apply_filters( 'rest_jsonp_enabled', $jsonp_enabled );
+
+        return $jsonp_enabled;
+
+}
+ No newline at end of file