Changeset 38956

Timestamp:

10/26/2016 02:31:33 PM (10 years ago)

Author:

johnbillion

Message:

Formatting: Don't overwrite the status header for Ajax responses that use output buffering or otherwise set their headers early.

Fixes #35666

File:

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

trunk/src/wp-includes/functions.php

@@ -2881 +2881 @@
         $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 );
@@ -3112 +3113 @@
         }
         echo wp_json_encode( $response );
-        if ( wp_doing_ajax() )
-                wp_die();
-        else
+
+        if ( wp_doing_ajax() ) {
+                wp_die( '', '', array(
+                        'response' => null,
+                ) );
+        } else {
                 die;
+        }
 }