Changeset 44625

Timestamp:

01/16/2019 03:21:49 PM (8 years ago)

Author:

flixos90

Message:

Bootstrap/Load: Add support for JSON requests to wp_die().

In addition to AJAX and XML-RPC requests, wp_die() now handles JSON requests correctly, returning information in the expected content type.

Props spacedmonkey.
See #45933, #44458.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -2976 +2976 @@
                  */
                 $function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
+        } elseif ( 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 ) {
                 /**
@@ -3213 +3222 @@
 </html>
         <?php
+        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 );
+
+        $r = wp_parse_args( $args, $defaults );
+
+        $data = array(
+                'code'    => 'wp_die',
+                'message' => $message,
+                'status'  => $r['response'],
+        );
+
+        if ( ! headers_sent() ) {
+                header( 'Content-Type: application/json; charset=utf-8' );
+                if ( null !== $r['response'] ) {
+                        status_header( $r['response'] );
+                }
+        }
+
+        echo wp_json_encode( $data );
         die();
 }