Ticket #46025: 46025.diff

src/wp-includes/functions.php

@@ -3247 +3247 @@
                 'status'  => $r['response'],
         );
 
+        if ( isset( $_GET['_jsonp'] ) ) {
+                $jsonp_callback = $_GET['_jsonp'];
+                $content_type   = 'application/javascript';
+        } else {
+                $jsonp_callback = false;
+                $content_type   = 'application/json';
+        }
+
         if ( ! headers_sent() ) {
-                header( 'Content-Type: application/json; charset=utf-8' );
+                header( 'Content-Type: ' . $content_type . '; charset=utf-8' );
                 if ( null !== $r['response'] ) {
                         status_header( $r['response'] );
                 }
         }
 
-        echo wp_json_encode( $data );
+        $result = wp_json_encode( $data );
+        if ( $jsonp_callback ) {
+                echo '/**/' . $jsonp_callback . '(' . $result . ')';
+        } else {
+                echo $result;
+        }
         die();
 }
 

src/wp-includes/load.php

@@ -1473 +1473 @@
  *
  * @since 5.0.0
  *
- * @return bool True if Accepts or Content-Type headers contain application/json, false otherwise.
+ * @return bool True if Accepts or Content-Type headers contain application/json or application/javascript, false otherwise.
  */
 function wp_is_json_request() {
 
-        if ( isset( $_SERVER['HTTP_ACCEPT'] ) && false !== strpos( $_SERVER['HTTP_ACCEPT'], 'application/json' ) ) {
-                return true;
+        $accepted = array( 'application/json', 'application/javascript' );
+
+        if ( isset( $_SERVER['HTTP_ACCEPT'] ) ) {
+                foreach ( $accepted as $type ) {
+                        if ( false !== strpos( $_SERVER['HTTP_ACCEPT'], $type ) ) {
+                                return true;
+                        }
+                }
         }
 
-        if ( isset( $_SERVER['CONTENT_TYPE'] ) && 'application/json' === $_SERVER['CONTENT_TYPE'] ) {
+
+        if ( isset( $_SERVER['CONTENT_TYPE'] ) && in_array( $_SERVER['CONTENT_TYPE'], $accepted, true )  ) {
                 return true;
         }