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

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
This commit is contained in:
Sergey Biryukov 2015-12-15 21:35:29 +00:00
parent bc6b11d0de
commit c2fcab7d82
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/locale.php
View File

@ -191,8 +191,7 @@ class WP_Locale {
if ( version_compare( PHP_VERSION, '5.4', '>=' ) ) { if ( version_compare( PHP_VERSION, '5.4', '>=' ) ) {
// Replace space with a non-breaking space to avoid wrapping. // 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( ' ', ' ', $thousands_sep );
$thousands_sep = str_replace( ' ', $non_breaking_space, $thousands_sep );
} else { } else {
// PHP < 5.4.0 does not support multiple bytes in thousands separator. // PHP < 5.4.0 does not support multiple bytes in thousands separator.
$thousands_sep = str_replace( array( '&nbsp;', '&#160;' ), ' ', $thousands_sep ); $thousands_sep = str_replace( array( '&nbsp;', '&#160;' ), ' ', $thousands_sep );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.