Ticket #19067: 19067_4.patch

wp-admin/includes/template.php

@@ -775 +775 @@
 /**
  * {@internal Missing Short Description}}
  *
- * @since 2.3.0
- *
- * @param unknown_type $bytes
- * @return unknown
- */
-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];
-}
-
-/**
- * {@internal Missing Short Description}}
- *
  * @since 2.5.0
  *
  * @return unknown
@@ -811 +795 @@
  */
 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'] ) ) :
                 ?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>

wp-includes/deprecated.php

@@ -2887 +2887 @@
 
         return is_user_member_of_blog( get_current_user_id(), $blog_id );
 }
+
+/**
+ * @see size_format()
+ *
+ * @since 2.3.0
+ * @deprecated in favor of size_format()
+ *
+ * @param int|string $bytes Number of bytes. Note max integer size for integers.
+ * @return bool|string False on failure. Number string on success.
+ */
+function wp_convert_bytes_to_hr( $bytes ) {
+        _deprecated_function( __FUNCTION__, '3.3', 'size_format()' );
+
+        return size_format( $bytes );
+}