From 224d20e99b5cc5a41223cd67b2137c4eb452f92c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 12 Dec 2015 01:41:34 +0000
Subject: [PATCH] Revert [35878].

See #34967.
Built from https://develop.svn.wordpress.org/trunk@35879


git-svn-id: http://core.svn.wordpress.org/trunk@35843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/locale.php  | 19 ++++---------------
 wp-includes/version.php |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/wp-includes/locale.php b/wp-includes/locale.php
index 54a3c93891..040fa5563a 100644
--- a/wp-includes/locale.php
+++ b/wp-includes/locale.php
@@ -187,23 +187,12 @@ class WP_Locale {
 		// See http://php.net/number_format
 
 		/* translators: $thousands_sep argument for http://php.net/number_format, default is , */
-		$thousands_sep = __( 'number_format_thousands_sep' );
-
-		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 );
-		} else {
-			// PHP < 5.4.0 does not support multiple bytes in thousands separator.
-			$thousands_sep = str_replace( array( '&nbsp;', '&#160;' ), ' ', $thousands_sep );
-		}
-
-		$this->number_format['thousands_sep'] = ( 'number_format_thousands_sep' === $thousands_sep ) ? ',' : $thousands_sep;
+		$trans = __('number_format_thousands_sep');
+		$this->number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans;
 
 		/* translators: $dec_point argument for http://php.net/number_format, default is . */
-		$decimal_point = __( 'number_format_decimal_point' );
-
-		$this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point;
+		$trans = __('number_format_decimal_point');
+		$this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
 
 		// Set text direction.
 		if ( isset( $GLOBALS['text_direction'] ) )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b10d215a23..ce7718a65c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-35878';
+$wp_version = '4.5-alpha-35879';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.