Changeset 37702

Timestamp:

06/14/2016 09:40:02 PM (8 years ago)

Author:

SergeyBiryukov

Message:

In size_format() and wp_convert_bytes_to_hr(), replace kB with KB for consistency with other units.

Props Presskopp, dashaluna.
Fixes #37037.

Location:

trunk

Files:

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

trunk/src/wp-includes/deprecated.php

@@ -3330 +3330 @@
     _deprecated_function( __FUNCTION__, '3.6', 'size_format()' );
 
-    $units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
+    $units = array( 0 => 'B', 1 => 'KB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
     $log   = log( $bytes, KB_IN_BYTES );
     $power = (int) $log;

trunk/src/wp-includes/functions.php

@@ -238 +238 @@
  * Convert number of bytes largest unit bytes will fit into.
  *
- * It is easier to read 1 kB than 1024 bytes and 1 MB 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.
@@ -260 +260 @@
         'GB' => GB_IN_BYTES,
         'MB' => MB_IN_BYTES,
-        'kB' => KB_IN_BYTES,
+        'KB' => KB_IN_BYTES,
         'B'  => 1,
     );

trunk/tests/phpunit/tests/media.php

@@ -274 +274 @@
         $this->assertEquals( '1GB', wp_convert_bytes_to_hr( $gb ) );
         $this->assertEquals( '1MB', wp_convert_bytes_to_hr( $mb ) );
-        $this->assertEquals( '1kB', wp_convert_bytes_to_hr( $kb ) );
+        $this->assertEquals( '1KB', wp_convert_bytes_to_hr( $kb ) );
 
         $this->assertEquals( '1 TB', size_format( $tb ) );
         $this->assertEquals( '1 GB', size_format( $gb ) );
         $this->assertEquals( '1 MB', size_format( $mb ) );
-        $this->assertEquals( '1 kB', size_format( $kb ) );
+        $this->assertEquals( '1 KB', size_format( $kb ) );
 
         // now some values around