Changeset 37962

Timestamp:

07/05/2016 10:35:24 AM (9 years ago)

Author:

ocean90

Message:

General: Return "O B" when passing 0 to size_format().

Props swissspidy.
Fixes #36635.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (1 diff)
• tests/phpunit/tests/functions/sizeFormat.php (added)

trunk/src/wp-includes/functions.php

@@ -263 +263 @@
         'B'  => 1,
     );
+
+    if ( 0 === $bytes ) {
+        return number_format_i18n( 0, $decimals ) . ' B';
+    }
 
     foreach ( $quant as $unit => $mag ) {

trunk/tests/phpunit/tests/functions.php

@@ -50 +50 @@
         $this->assertInternalType( 'string', $args['foo'] );
         $this->assertInternalType( 'string', $args['bar'] );
-    }
-
-    function test_size_format() {
-        $b  = 1;
-        $kb = 1024;
-        $mb = $kb*1024;
-        $gb = $mb*1024;
-        $tb = $gb*1024;
-        // test if boundaries are correct
-        $this->assertEquals('1 GB', size_format($gb, 0));
-        $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
-        $this->assertEquals('1.5 TB', size_format($tb + $tb/2 + $mb, 1));
-        $this->assertEquals('1,023.999 GB', size_format($tb-$mb-$kb, 3));
-        // edge
-        $this->assertFalse(size_format(-1));
-        $this->assertFalse(size_format(0));
-        $this->assertFalse(size_format('baba'));
-        $this->assertFalse(size_format(array()));
     }