Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2015-12-12 01:41:34 +00:00
parent 746c697099
commit 224d20e99b
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/locale.php
View File

@ -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( ' ', 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'] ) )

2
wp-includes/version.php
View File

@ -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.