Changeset 28343

Timestamp:

05/07/2014 06:24:47 PM (11 years ago)

Author:

wonderboymusic

Message:

Leverage size_format() when displaying max_upload_size:

• In media_upload_form()
• The uploader-inline Underscore template in the media modal.

Replaces 2 buggy inline implementations that could display size units off by one, or size values off by one.

Fixes #25643.

Location:

trunk/src

Files:

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

trunk/src/wp-admin/includes/media.php

@@ -1691 +1691 @@
     $_tab = isset($tab) ? $tab : '';
 
-    $upload_size_unit = $max_upload_size = wp_max_upload_size();
-    $sizes = array( 'KB', 'MB', 'GB' );
-
-    for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) {
-        $upload_size_unit /= 1024;
-    }
-
-    if ( $u < 0 ) {
-        $upload_size_unit = 0;
-        $u = 0;
-    } else {
-        $upload_size_unit = (int) $upload_size_unit;
+    $max_upload_size = wp_max_upload_size();
+    if ( ! $max_upload_size ) {
+        $max_upload_size = 0;
     }
 ?>
@@ -1737 +1728 @@
 
 $post_params = array(
-        "post_id" => $post_id,
-        "_wpnonce" => wp_create_nonce('media-form'),
-        "type" => $_type,
-        "tab" => $_tab,
-        "short" => "1",
+    "post_id" => $post_id,
+    "_wpnonce" => wp_create_nonce('media-form'),
+    "type" => $_type,
+    "tab" => $_tab,
+    "short" => "1",
 );
 
@@ -1851 +1842 @@
 </div>
 
-<span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></span>
+<span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></span>
 <?php
 

trunk/src/wp-includes/media-template.php

@@ -187 +187 @@
                 }
 
-                $upload_size_unit = $max_upload_size = wp_max_upload_size();
-                $byte_sizes = array( 'KB', 'MB', 'GB' );
-
-                for ( $u = -1; $upload_size_unit > 1024 && $u < count( $byte_sizes ) - 1; $u++ ) {
-                    $upload_size_unit /= 1024;
+                $max_upload_size = wp_max_upload_size();
+                if ( ! $max_upload_size ) {
+                    $max_upload_size = 0;
                 }
-
-                if ( $u < 0 ) {
-                    $upload_size_unit = 0;
-                    $u = 0;
-                } else {
-                    $upload_size_unit = (int) $upload_size_unit;
-                }
-
                 ?>
 
                 <p class="max-upload-size"><?php
-                    printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($byte_sizes[$u]) );
+                    printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
                 ?></p>