Changeset 23439

Timestamp:

02/16/2013 03:07:56 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Deprecate wp_convert_bytes_to_hr() in favor of size_format(). props F J Kaiser. fixes #19067.

Location:

trunk

Files:

• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

trunk/wp-admin/includes/template.php

@@ -777 +777 @@
 function wp_import_upload_form( $action ) {
     $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
-    $size = wp_convert_bytes_to_hr( $bytes );
+    $size = size_format( $bytes );
     $upload_dir = wp_upload_dir();
     if ( ! empty( $upload_dir['error'] ) ) :

trunk/wp-includes/deprecated.php

@@ -3365 +3365 @@
     return false;
 }
+
+/**
+ * Converts an integer byte value to a shorthand byte value.
+ *
+ * @since 2.3.0
+ * @deprecated 3.6.0
+ * @deprecated Use size_format()
+ *
+ * @param int $bytes An integer byte value.
+ * @return string A shorthand byte value.
+ */
+function wp_convert_bytes_to_hr( $bytes ) {
+    _deprecated_function( __FUNCTION__, '3.6', 'size_format()' );
+    return size_format( $bytes );
+}

trunk/wp-includes/media.php

@@ -1131 +1131 @@
 
 /**
- * Converts an integer byte value to a shorthand byte value.
- *
- * @since 2.3.0
- *
- * @param int $bytes An integer byte value.
- * @return string A shorthand byte value.
- */
-function wp_convert_bytes_to_hr( $bytes ) {
-    $units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB' );
-    $log   = log( $bytes, 1024 );
-    $power = (int) $log;
-    $size  = pow( 1024, $log - $power );
-    return $size . $units[$power];
-}
-
-/**
  * Determine the maximum upload size allowed in php.ini.
  *