From c2fcab7d82dc59570994e7ecaf9876ec2f32828a Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 15 Dec 2015 21:35:29 +0000 Subject: [PATCH] I18N: After [35884], remove `html_entity_decode()` for the thousands separator in `WP_Locale::init()`, use the ` ` entity directly. We can't `get_option( 'blog_charset' )` here, because the database may not be available. Fixes #10373. Built from https://develop.svn.wordpress.org/trunk@35951 git-svn-id: http://core.svn.wordpress.org/trunk@35915 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/locale.php | 3 +-- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wp-includes/locale.php b/wp-includes/locale.php index 54a3c93891..622619551b 100644 --- a/wp-includes/locale.php +++ b/wp-includes/locale.php @@ -191,8 +191,7 @@ class WP_Locale { if ( version_compare( PHP_VERSION, '5.4', '>=' ) ) { // Replace space with a non-breaking space to avoid wrapping. - $non_breaking_space = html_entity_decode( ' ', ENT_QUOTES, get_option( 'blog_charset' ) ); - $thousands_sep = str_replace( ' ', $non_breaking_space, $thousands_sep ); + $thousands_sep = str_replace( ' ', ' ', $thousands_sep ); } else { // PHP < 5.4.0 does not support multiple bytes in thousands separator. $thousands_sep = str_replace( array( ' ', ' ' ), ' ', $thousands_sep ); diff --git a/wp-includes/version.php b/wp-includes/version.php index e5fc78ada6..c2764150b3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-35950'; +$wp_version = '4.5-alpha-35951'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.