Ticket #19067: 19067.6.patch

wp-admin/includes/deprecated.php

@@ -1015 +1015 @@
  * @since 1.2.0
  * @deprecated 3.5.0
  * @deprecated Use image_resize()
- * @see  image_resize()
+ * @see image_resize()
  *
  * @param mixed $file Filename of the original image, Or attachment id.
  * @param int $max_side Maximum length of a single side for the thumbnail.
@@ -1023 +1023 @@
  * @return string Thumbnail path on success, Error string on failure.
  */
 function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
-        _deprecated_function( __FUNCTION__, '3.5', 'image_resize' );
+        _deprecated_function( __FUNCTION__, '3.5', 'image_resize()' );
         return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
 }
+
+/**
+ * {@internal Missing Short Description}}
+ *
+ * @since 2.3.0
+ * @deprecated 3.6.0
+ * @deprecated Use size_format()
+ *
+ * @param unknown_type $bytes
+ * @return unknown
+ */
+function wp_convert_bytes_to_hr( $bytes ) {
+        _deprecated_function( __FUNCTION__, '3.6', 'size_format()' );
+        return size_format( $bytes );
+}

wp-admin/includes/template.php

@@ -780 +780 @@
  */
 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/media.php

@@ -1123 +1123 @@
 /**
  * {@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