From fbd6efdfb890d12fd7d92a0ce5d365ab5e627499 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 1 Nov 2014 22:00:24 +0000 Subject: [PATCH] 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 --- wp-includes/functions.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 482e5521c9..19fdbbfd68 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -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 ); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index e4ff6f0382..93ee3e08ce 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -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.