Ticket #25643: 25643.diff
File 25643.diff, 2.5 KB (added by , 11 years ago) |
---|
-
src/wp-admin/includes/media.php
1696 1696 $_type = isset($type) ? $type : ''; 1697 1697 $_tab = isset($tab) ? $tab : ''; 1698 1698 1699 $upload_size_unit = $max_upload_size = wp_max_upload_size(); 1700 $sizes = array( 'KB', 'MB', 'GB' ); 1701 1702 for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) { 1703 $upload_size_unit /= 1024; 1699 $max_upload_size = wp_max_upload_size(); 1700 if ( ! $max_upload_size ) { 1701 $max_upload_size = 0; 1704 1702 } 1705 1706 if ( $u < 0 ) {1707 $upload_size_unit = 0;1708 $u = 0;1709 } else {1710 $upload_size_unit = (int) $upload_size_unit;1711 }1712 1703 ?> 1713 1704 1714 1705 <div id="media-upload-notice"><?php … … 1742 1733 do_action( 'pre-upload-ui' ); 1743 1734 1744 1735 $post_params = array( 1745 1746 1747 1748 1749 1736 "post_id" => $post_id, 1737 "_wpnonce" => wp_create_nonce('media-form'), 1738 "type" => $_type, 1739 "tab" => $_tab, 1740 "short" => "1", 1750 1741 ); 1751 1742 1752 1743 /** … … 1856 1847 ?> 1857 1848 </div> 1858 1849 1859 <span class="max-upload-size"><?php printf( __( 'Maximum upload file size: % d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></span>1850 <span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></span> 1860 1851 <?php 1861 1852 1862 1853 /** -
src/wp-includes/media-template.php
186 186 do_action( 'post-plupload-upload-ui' ); 187 187 } 188 188 189 $upload_size_unit = $max_upload_size = wp_max_upload_size(); 190 $byte_sizes = array( 'KB', 'MB', 'GB' ); 191 192 for ( $u = -1; $upload_size_unit > 1024 && $u < count( $byte_sizes ) - 1; $u++ ) { 193 $upload_size_unit /= 1024; 189 $max_upload_size = wp_max_upload_size(); 190 if ( ! $max_upload_size ) { 191 $max_upload_size = 0; 194 192 } 195 196 if ( $u < 0 ) {197 $upload_size_unit = 0;198 $u = 0;199 } else {200 $upload_size_unit = (int) $upload_size_unit;201 }202 203 193 ?> 204 194 205 195 <p class="max-upload-size"><?php 206 printf( __( 'Maximum upload file size: % d%s.' ), esc_html($upload_size_unit), esc_html($byte_sizes[$u]) );196 printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); 207 197 ?></p> 208 198 209 199 <# if ( data.suggestedWidth && data.suggestedHeight ) { #>