Changeset 14776

Timestamp:

05/21/2010 12:57:49 PM (15 years ago)

Author:

dd32

Message:

We're not as bold as some people make us out to be. Move the maximum upload size from a Heading to a paragraph text. Fix screen formatting on Multisite when over quota. see #12853

File:

• trunk/wp-admin/includes/media.php (modified) (5 diffs)

trunk/wp-admin/includes/media.php

@@ -1401 +1401 @@
     $post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
 
+    $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;
+    }
 ?>
 <script type="text/javascript">
@@ -1422 +1432 @@
 <?php } ?>
 </div>
-<div id="media-upload-size">
-<?php 
-    $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;
-    }
-    printf( '<h3>' . __( 'Maximum upload file size: %d%s' ) . '</h3>', $upload_size_unit, $sizes[$u] );
-?>
-</div>
-
 <?php
 // Check quota for this blog if multisite
-if ( is_multisite() && !is_upload_space_available() )
-    wp_die( __('Sorry, you must delete files before you can upload any more.') );
+if ( is_multisite() && !is_upload_space_available() ) {
+    echo '<p>' . __('Sorry, you must delete files before you can upload any more.') . '</p>';
+    return;
+}
 
 do_action('pre-upload-ui');
@@ -1464 +1460 @@
             post_params : {
                 "post_id" : "<?php echo $post_id; ?>",
-                "auth_cookie" : "<?php if ( is_ssl() ) echo $_COOKIE[SECURE_AUTH_COOKIE]; else echo $_COOKIE[AUTH_COOKIE]; ?>",
+                "auth_cookie" : "<?php echo (is_ssl() ? $_COOKIE[SECURE_AUTH_COOKIE] : $_COOKIE[AUTH_COOKIE]); ?>",
                 "logged_in_cookie": "<?php echo $_COOKIE[LOGGED_IN_COOKIE]; ?>",
                 "_wpnonce" : "<?php echo wp_create_nonce('media-form'); ?>",
@@ -1500 +1496 @@
     <?php _e( 'Choose files to upload' ); ?>
     <div id="flash-browse-button"></div>
-    <span><input id="cancel-upload" disabled="disabled" onclick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></span>
+    <span><input id="cancel-upload" disabled="disabled" onClick="cancelUpload()" type="button" value="<?php esc_attr_e('Cancel Upload'); ?>" class="button" /></span>
     </div>
+    <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
 <?php do_action('post-flash-upload-ui'); ?>
     <p class="howto"><?php _e('After a file has been uploaded, you can add titles and descriptions.'); ?></p>
@@ -1514 +1511 @@
     </p>
     <div class="clear"></div>
+    <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
     <?php if ( is_lighttpd_before_150() ): ?>
     <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please upgrade to lighttpd 1.5.'); ?></p>