WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for `WP_Error` objects passed to `wp_send_json_error()`. The error object gets output as an array of error codes and messages, rather than as an empty object. 

Fixes #28978
Props paulschreiber

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


git-svn-id: http://core.svn.wordpress.org/trunk@30495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2014-11-21 16:56:23 +00:00
parent 97b412af37
commit 53a9e3b420
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/functions.php
View File

@ -2801,15 +2801,32 @@ function wp_send_json_success( $data = null ) {
/**
* Send a JSON response back to an Ajax request, indicating failure.
*
* If the `$data` parameter is a `WP_Error` object, the errors within the object are processed
* and output as an array of error codes and corresponding messages. All other types are
* output without further processing.
*
* @since 3.5.0
* @since 4.1.0 The `$data` parameter is now processed if a `WP_Error` object is passed in.
*
* @param mixed $data Data to encode as JSON, then print and die.
*/
function wp_send_json_error( $data = null ) {
$response = array( 'success' => false );
if ( isset( $data ) )
if ( isset( $data ) ) {
if ( is_wp_error( $data ) ) {
$result = array();
foreach ( $data->errors as $code => $messages ) {
foreach ( $messages as $message ) {
$result[] = array( 'code' => $code, 'message' => $message );
}
}
$response['data'] = $result;
} else {
$response['data'] = $data;
}
}
wp_send_json( $response );
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-beta2-30505';
$wp_version = '4.1-beta2-30506';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.