Ticket #45933: 45933.1.diff

src/wp-includes/class-wp-shutdown-handler.php

@@ -129 +129 @@
                         $message = substr( $message, 3, -4 );
                 }
 
-                wp_die( $message, '', 500 );
+                $status = 500;
+
+                if ( class_exists( 'WP_Error', false ) ) {
+                        $error_code = 'php_fatal_error';
+                        $message    = new WP_Error( $error_code, $message, array( 'status' => $status ) );
+                }
+
+                wp_die( $message, '', $status );
         }
 
         /**

src/wp-includes/functions.php

@@ -2970 +2970 @@
                  * @param callable $function Callback function name.
                  */
                 $function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
+        } else if ( wp_is_json_request()  ) {
+                /**
+                 * Filters the callback for killing WordPress execution for JSON requests.
+                 *
+                 * @since 5.1.0
+                 *
+                 * @param callable $function Callback function name.
+                 */
+                $function = apply_filters( 'wp_die_json_handler', '_json_wp_die_handler' );
         } elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
                 /**
                  * Filters the callback for killing WordPress execution for XML-RPC requests.
@@ -3227 +3236 @@
         }
         die();
 }
+
+/**
+ * Kill WordPress execution and display JSON message with error message.
+ *
+ * This is the handler for wp_die when processing JSON 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 _json_wp_die_handler( $message, $title = '', $args = array() ) {
+        $defaults = array( 'response' => 500, 'code' => '_json_wp_die_handler' );
+
+        $r = wp_parse_args( $args, $defaults );
+
+        $data = array();
+        if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
+                $errors = array();
+                foreach ( (array) $message->errors as $code => $messages ) {
+                        foreach ( (array) $messages as $display_message ) {
+                                $errors[] = array(
+                                        'code'    => $code,
+                                        'message' => strip_tags( $display_message ),
+                                        'data'    => $message->get_error_data( $code ),
+                                );
+                        }
+                }
+
+                $data = $errors[0];
+                if ( count( $errors ) > 1 ) {
+                        // Remove the primary error.
+                        array_shift( $errors );
+                        $data['additional_errors'] = $errors;
+                }
+        } else {
+                $data = array(
+                        'code'    => $r['code'],
+                        'message' => strip_tags( $message ),
+                );
+        }
+
+        if ( ! isset( $data['data']['status'] ) ) {
+                $data['data']['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() ) {
+                $blog_charset = 'utf-8';
+                header( 'Content-Type: ' . $content_type . '; charset=' . $blog_charset );
+                status_header( $data['data']['status'] );
+                nocache_headers();
+        }
+
+        $result         = wp_json_encode( $data );
+        if ( $jsonp_callback ) {
+                echo '/**/' . $jsonp_callback . '(' . $result . ')';
+        } else {
+                echo $result;
+        }
+        die();
+}
 
 /**
  * Kill WordPress ajax execution.
@@ -5073 +5154 @@
                 $exists[4] = ( $exists[1] && $exists[3] );
                 $exists[5] = ( $exists[2] && $exists[3] );
 
-                // phpcs:disable WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
                 $zonen[] = array(
                         'continent'   => ( $exists[0] ? $zone[0] : '' ),
                         'city'        => ( $exists[1] ? $zone[1] : '' ),
@@ -5082 +5162 @@
                         't_city'      => ( $exists[4] ? translate( str_replace( '_', ' ', $zone[1] ), 'continents-cities' ) : '' ),
                         't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' ),
                 );
-                // phpcs:enable
         }
         usort( $zonen, '_wp_timezone_choice_usort_callback' );
 

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;
         }