From 0dff84ad23ef33e7b44e6571233d18fcbef49e99 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Wed, 26 Oct 2016 14:31:33 +0000 Subject: [PATCH] Formatting: Don't overwrite the status header for Ajax responses that use output buffering or otherwise set their headers early. Fixes #35666 git-svn-id: https://develop.svn.wordpress.org/trunk@38956 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index d28b792537..112f0ffed0 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -2880,9 +2880,10 @@ function _ajax_wp_die_handler( $message, $title = '', $args = array() ) { ); $r = wp_parse_args( $args, $defaults ); - if ( ! headers_sent() ) { + if ( ! headers_sent() && null !== $r['response'] ) { status_header( $r['response'] ); } + if ( is_scalar( $message ) ) die( (string) $message ); die( '0' ); @@ -3111,10 +3112,14 @@ function wp_send_json( $response, $status_code = null ) { status_header( $status_code ); } echo wp_json_encode( $response ); - if ( wp_doing_ajax() ) - wp_die(); - else + + if ( wp_doing_ajax() ) { + wp_die( '', '', array( + 'response' => null, + ) ); + } else { die; + } } /**