Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 06:13:07 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fixes #35666

Built from https://develop.svn.wordpress.org/trunk@38956


git-svn-id: http://core.svn.wordpress.org/trunk@38899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-10-26 14:32:28 +00:00
parent 49c5fb895d
commit 6161ad9020
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/functions.php
View File

@ -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;
}
}
/**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.7-alpha-38955';
$wp_version = '4.7-alpha-38956';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.