From 70984aeb6f6c3b2ec705b2e4bce97ebf2815d193 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 14 Jun 2016 21:41:28 +0000 Subject: [PATCH] In `size_format()` and `wp_convert_bytes_to_hr()`, replace `kB` with `KB` for consistency with other units. Props Presskopp, dashaluna. Fixes #37037. Built from https://develop.svn.wordpress.org/trunk@37702 git-svn-id: http://core.svn.wordpress.org/trunk@37668 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/deprecated.php | 2 +- wp-includes/functions.php | 4 ++-- wp-includes/version.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index f3a95c521b..ae1dce5e1e 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -3329,7 +3329,7 @@ function gd_edit_image_support($mime_type) { function wp_convert_bytes_to_hr( $bytes ) { _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; $size = pow( KB_IN_BYTES, $log - $power ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index a39e7034cb..497d264a89 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -237,7 +237,7 @@ function number_format_i18n( $number, $decimals = 0 ) { /** * 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. * @@ -259,7 +259,7 @@ function size_format( $bytes, $decimals = 0 ) { 'TB' => TB_IN_BYTES, 'GB' => GB_IN_BYTES, 'MB' => MB_IN_BYTES, - 'kB' => KB_IN_BYTES, + 'KB' => KB_IN_BYTES, 'B' => 1, ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 78213a0bf0..dcf6ebea43 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37701'; +$wp_version = '4.6-alpha-37702'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.