Changeset 31052

Timestamp:

01/05/2015 01:12:06 PM (10 years ago)

Author:

pento

Message:

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

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

Fixes #30908.

Props tillkruess.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -183 +183 @@
  * 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
  * that the bytes will go into it. Supports TB value.
@@ -207 +207 @@
         'MB' => 1048576,        // pow( 1024, 2)
         '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 false;

trunk/tests/phpunit/tests/functions.php

@@ -40 +40 @@
     }
     function test_size_format() {
+        $b  = 1;
         $kb = 1024;
         $mb = $kb*1024;
@@ -48 +49 @@
         $this->assertEquals('1 MB', size_format($mb, 0));
         $this->assertEquals('1 kB', size_format($kb, 0));
+        $this->assertEquals('1 B',  size_format($b, 0));
         // now some values around
         // add some bytes to make sure the result isn't 1.4999999