In _wp_json_convert_string(), when $use_mb is false, perhaps pass a variable that actually exists to wp_check_invalid_utf8().

Introduced in [30055].
See #30224.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-11-01 22:00:24 +00:00
parent cd9bb04981
commit fbd6efdfb8
2 changed files with 2 additions and 2 deletions

View File

@ -2739,7 +2739,7 @@ function _wp_json_convert_string( $string ) {
return mb_convert_encoding( $string, 'UTF-8', 'UTF-8' );
}
} else {
return wp_check_invalid_utf8( $data, true );
return wp_check_invalid_utf8( $string, true );
}
}

View File

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