When `wp_json_encode()` calls `json_encode()`, the latter will generate warnings if the string contains non-UTF-8 characters. No-one likes warnings, so we need to do something about that.

The good news is, the point of `wp_json_encode()` is to handle those non-UTF-8 characters. It'll totally just fix them up, no problem.

Anyway, we can just ignore those warnings.

Fixes #33524.


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


git-svn-id: http://core.svn.wordpress.org/trunk@33715 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-08-26 03:26:21 +00:00
parent c3565b2cba
commit 48e83418ed
2 changed files with 2 additions and 2 deletions

View File

@ -2677,7 +2677,7 @@ function wp_json_encode( $data, $options = 0, $depth = 512 ) {
$args = array( $data );
}
$json = call_user_func_array( 'json_encode', $args );
$json = @call_user_func_array( 'json_encode', $args );
// If json_encode() was successful, no need to do more sanity checking.
// ... unless we're in an old version of PHP, and json_encode() returned

View File

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