From 333f1c38ea93d89996b98d005b38f3a51b3fac39 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Tue, 15 Dec 2015 21:34:15 +0000
Subject: [PATCH] I18N: After [35884], remove `html_entity_decode()` for the
 thousands separator in `WP_Locale::init()`, use the `&nbsp;` entity directly.

We can't `get_option( 'blog_charset' )` here, because the database may not be available.

Fixes #10373.

git-svn-id: https://develop.svn.wordpress.org/trunk@35951 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/locale.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wp-includes/locale.php b/src/wp-includes/locale.php
index 54a3c93891..622619551b 100644
--- a/src/wp-includes/locale.php
+++ b/src/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( '&nbsp;', ENT_QUOTES, get_option( 'blog_charset' ) );
-			$thousands_sep = str_replace( ' ', $non_breaking_space, $thousands_sep );
+			$thousands_sep = str_replace( ' ', '&nbsp;', $thousands_sep );
 		} else {
 			// PHP < 5.4.0 does not support multiple bytes in thousands separator.
 			$thousands_sep = str_replace( array( '&nbsp;', '&#160;' ), ' ', $thousands_sep );