Ticket #25643: 25643.diff

src/wp-admin/includes/media.php

@@ -1696 +1696 @@
         $_type = isset($type) ? $type : '';
         $_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;
+        $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;
-        }
 ?>
 
 <div id="media-upload-notice"><?php
@@ -1742 +1733 @@
 do_action( 'pre-upload-ui' );
 
 $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",
 );
 
 /**
@@ -1856 +1847 @@
 ?>
 </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
 
         /**

src/wp-includes/media-template.php

@@ -186 +186 @@
                                         do_action( 'post-plupload-upload-ui' );
                                 }
 
-                                $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>
 
                                 <# if ( data.suggestedWidth && data.suggestedHeight ) { #>