Ticket #35666: 35666.2.diff

src/wp-includes/functions.php

@@ -2868 +2868 @@
         );
         $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' );
@@ -3099 +3100 @@
                 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;
+        }
 }
 
 /**