Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-14 22:56:19 +01:00
Code Issues Projects Releases Wiki Activity

size_format() incorrectly included a trailing space for B values: less than 1024 bytes.

Browse Source 
Also add a unit test to check for this, so we don't do it again.

Fixes #30908.

Props tillkruess.
 

Built from https://develop.svn.wordpress.org/trunk@31052


git-svn-id: http://core.svn.wordpress.org/trunk@31033 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-01-05 13:13:23 +00:00
parent 0e806f1695
commit e6a74136f9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/functions.php
View File

@ -182,7 +182,7 @@ function number_format_i18n( $number, $decimals = 0 ) {
/** /**
* Convert number of bytes largest unit bytes will fit into. * Convert number of bytes largest unit bytes will fit into.
* *
* It is easier to read 1kB than 1024 bytes and 1MB than 1048576 bytes. Converts * It is easier to read 1 kB than 1024 bytes and 1 MB than 1048576 bytes. Converts
* number of bytes to human readable number by taking the number of that unit * number of bytes to human readable number by taking the number of that unit
* that the bytes will go into it. Supports TB value. * that the bytes will go into it. Supports TB value.
* *
@ -206,11 +206,14 @@ function size_format( $bytes, $decimals = 0 ) {
'GB' => 1073741824, // pow( 1024, 3) 'GB' => 1073741824, // pow( 1024, 3)
'MB' => 1048576, // pow( 1024, 2) 'MB' => 1048576, // pow( 1024, 2)
'kB' => 1024, // pow( 1024, 1) 'kB' => 1024, // pow( 1024, 1)
'B ' => 1, // pow( 1024, 0) 'B' => 1, // pow( 1024, 0)
); );
foreach ( $quant as $unit => $mag )
if ( doubleval($bytes) >= $mag ) foreach ( $quant as $unit => $mag ) {
if ( doubleval( $bytes ) >= $mag ) {
return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit; return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
}
}
return false; return false;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31051'; $wp_version = '4.2-alpha-31052';
/** /**
* 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.