Changeset 35325 for trunk/src/wp-admin/includes/ms.php

Timestamp:

10/21/2015 02:02:59 PM (10 years ago)

Author:

DrewAPicture

Message:

Filesystem: Following the introduction of the KB|MB|GB|TB_IN_BYTES constants in [35286], use them in various places in core.

Props sudar.
Fixes #22405.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (2 diffs)

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

@@ -29 +29 @@
 
     $file_size = filesize( $file['tmp_name'] );
-    if ( $space_left < $file_size )
-        $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
-    if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-        $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
+    if ( $space_left < $file_size ) {
+        $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
+    }
+
+    if ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+        $file['error'] = sprintf( __( 'This file is too big. Files must be less than %1$s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
+    }
+
     if ( upload_is_user_over_quota( false ) ) {
         $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
     }
+
     if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
         wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
@@ -444 +449 @@
 
     if ( $space_allowed > 1000 ) {
-        $space = number_format( $space_allowed / 1024 );
+        $space = number_format( $space_allowed / KB_IN_BYTES );
         /* translators: Gigabytes */
         $space .= __( 'GB' );