Changeset 5801

Timestamp:

07/15/2007 05:52:50 PM (17 years ago)

Author:

ryan

Message:

Show upload file size in upload browser. Props tellyworth. fixes #4561

Location:

trunk

Files:

• wp-admin/includes/upload.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/includes/upload.php

@@ -6 +6 @@
     $attachment_data = wp_get_attachment_metadata( $id );
     $is_image = (int) wp_attachment_is_image();
+    $filesystem_path = get_attached_file( $id );
     if ( !isset($attachment_data['width']) && $is_image ) {
-        if ( $image_data = getimagesize( get_attached_file( $id ) ) ) {
+        if ( $image_data = getimagesize( $filesystem_path ) ) {
             $attachment_data['width'] = $image_data[0];
             $attachment_data['height'] = $image_data[1];
@@ -39 +40 @@
     if ( $href )
         $r .= "</a>\n";
+    $r .= "\t\t\t\t<span class='upload-file-size'>".size_format(filesize($filesystem_path))."</span>\n";
     $r .= "\n\t\t<div class='upload-file-data'>\n\t\t\t<p>\n";
     $r .= "\t\t\t\t<input type='hidden' name='attachment-url-$id' id='attachment-url-$id' value='$src' />\n";

trunk/wp-includes/functions.php

@@ -90 +90 @@
 
     return number_format($number, $decimals, $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep']);
+}
+
+function size_format($bytes, $decimals = null) {
+    // technically the correct unit names for powers of 1024 are KiB, MiB etc
+    // see http://en.wikipedia.org/wiki/Byte
+    $quant = array(
+        'TB' => pow(1024, 4),
+        'GB' => pow(1024, 3),
+        'MB' => pow(1024, 2),
+        'kB' => pow(1024, 1),
+        'B'  => pow(1024, 0),
+    );
+
+    foreach ($quant as $unit => $mag)
+        if ( intval($bytes) >= $mag )
+            return number_format_i18n($bytes / $mag, $decimals) . ' ' . $unit;
 }