Ticket #45933: 45933.9.diff

src/wp-includes/functions.php

@@ -3026 +3026 @@
 
         $have_gettext = function_exists( '__' );
 
-        if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
-                if ( empty( $title ) ) {
-                        $error_data = $message->get_error_data();
-                        if ( is_array( $error_data ) && isset( $error_data['title'] ) ) {
-                                $title = $error_data['title'];
-                        }
-                }
-                $errors = $message->get_error_messages();
-                switch ( count( $errors ) ) {
-                        case 0:
-                                $message = '';
-                                break;
-                        case 1:
-                                $message = "<p>{$errors[0]}</p>";
-                                break;
-                        default:
-                                $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
-                                break;
-                }
-        } elseif ( is_string( $message ) ) {
-                $message = "<p>$message</p>";
-        }
+        $result = _wp_die_process_input( $message, $title, $r );
+        if ( isset( $result['additional_errors'] ) && ! empty( $result['additional_errors'] ) ) {
+                $message = "<ul>\n\t\t<li>" . $result['message'] . "</li>\n\t\t<li>" . join( "</li>\n\t\t<li>", $result['additional_errors'] ) . "</li>\n\t</ul>";
+        } else {
+                $message = "<p>" . $result['message'] . "</p>";
+    }
 
+
         if ( ! empty( $r['link_url'] ) && ! empty( $r['link_text'] ) ) {
                 $link_url = $r['link_url'];
                 if ( function_exists( 'esc_url' ) ) {
@@ -3065 +3050 @@
 
         if ( ! did_action( 'admin_head' ) ) :
                 if ( ! headers_sent() ) {
-                        status_header( $r['response'] );
+                        status_header( $result['data']['status'] );
                         nocache_headers();
                         header( 'Content-Type: text/html; charset=utf-8' );
                 }
 
-                if ( empty( $title ) ) {
-                        $title = $have_gettext ? __( 'WordPress &rsaquo; Error' ) : 'WordPress &rsaquo; Error';
-                }
-
                 $text_direction = 'ltr';
                 if ( isset( $r['text_direction'] ) && 'rtl' == $r['text_direction'] ) {
                         $text_direction = 'rtl';
@@ -3097 +3078 @@
                         wp_no_robots();
                 }
                 ?>
-        <title><?php echo $title; ?></title>
+        <title><?php echo $result['data']['title']; ?></title>
         <style type="text/css">
                 html {
                         background: #f1f1f1;
@@ -3241 +3222 @@
 
         $r = wp_parse_args( $args, $defaults );
 
-        $data = array(
-                'code'    => 'wp_die',
-                'message' => $message,
-                'status'  => $r['response'],
-        );
+        $result = _wp_die_process_input( $message, $title, $r );
 
         if ( ! headers_sent() ) {
                 header( 'Content-Type: application/json; charset=utf-8' );
-                if ( null !== $r['response'] ) {
-                        status_header( $r['response'] );
+                nocache_headers();
+                if ( null !== $result['data']['status'] ) {
+                        status_header( $result['data']['status'] );
                 }
         }
 
-        echo wp_json_encode( $data );
+        echo wp_json_encode( $result );
         die();
 }
 
@@ -3276 +3254 @@
         global $wp_xmlrpc_server;
         $defaults = array( 'response' => 500 );
 
-        $r = wp_parse_args( $args, $defaults );
+        $r      = wp_parse_args( $args, $defaults );
+        $result = _wp_die_process_input( $message, $title, $r );
 
         if ( $wp_xmlrpc_server ) {
-                $error = new IXR_Error( $r['response'], $message );
+                $error = new IXR_Error( $result['data']['status'], $result['message'] );
                 $wp_xmlrpc_server->output( $error->getXml() );
         }
         die();
@@ -3303 +3282 @@
         );
         $r        = wp_parse_args( $args, $defaults );
 
-        if ( ! headers_sent() && null !== $r['response'] ) {
-                status_header( $r['response'] );
+        $result = _wp_die_process_input( $message, $title, $r );
+
+        if ( ! headers_sent() && null !== $result['data']['status'] ) {
+                status_header( $result['data']['status'] );
+                nocache_headers();
         }
 
-        if ( is_scalar( $message ) ) {
-                die( (string) $message );
+        if ( is_scalar( $result['message'] ) ) {
+                die( (string) $result['message'] );
         }
         die( '0' );
 }
@@ -3331 +3313 @@
 }
 
 /**
+ * Helper function to process input from wp_die requests and format them into a usable array.
+ *
+ * @since 5.1.0
+ * @access private
+ *
+ * @param $message
+ * @param title
+ * @param array $args
+ *
+ * @return array $results
+ */
+function _wp_die_process_input( $message = '', $title = '', array $args = array() ) {
+
+        $defaults = array( 'response' => 500, 'code' => 'wp_die', );
+        $args = wp_parse_args( $args, $defaults );
+        $data = array(
+                'code'    => $args['code'],
+                'message' => '',
+                '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' => $display_message,
+                                        'data'    => $message->get_error_data( $code ),
+                                );
+                        }
+                }
+                if ( $errors ) {
+                        $data = $errors[0];
+                        if ( count( $errors ) > 1 ) {
+                                // Remove the primary error.
+                                array_shift( $errors );
+                                $data['additional_errors'] = $errors;
+                        }
+                }
+
+                $error_data = $message->get_error_data();
+                if ( is_array( $error_data ) && isset( $error_data['title'] ) ) {
+                        $title = $error_data['title'];
+                }
+        } else {
+                $data ['message'] = $message;
+        }
+
+        if ( ! isset( $data['data']['status'] ) ) {
+                $data['data']['status'] = $args['response'];
+        }
+
+        if ( empty( $title ) ) {
+                $have_gettext = function_exists( '__' );
+                $title = $have_gettext ? __( 'WordPress &rsaquo; Error' ) : 'WordPress &rsaquo; Error';
+        }
+
+        $data['data']['title'] = $title;
+
+        return $data;
+}
+
+/**
  * Encode a variable into JSON, with some sanity checks.
  *
  * @since 4.1.0