Changeset 35325 for trunk/src/wp-includes/ms-functions.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-includes/ms-functions.php (modified) (4 diffs)

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

@@ -1875 +1875 @@
         return $upload;
 
-    if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-        return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
+    if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+        return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
+    }
 
     return $upload;
@@ -2279 +2280 @@
     if ( false === $space_used ) {
         $upload_dir = wp_upload_dir();
-        $space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024;
+        $space_used = get_dirsize( $upload_dir['basedir'] ) / MB_IN_BYTES;
     }
 
@@ -2323 +2324 @@
         $allowed = 0;
     }
-    $space_allowed = $allowed * 1024 * 1024;
+    $space_allowed = $allowed * MB_IN_BYTES;
     if ( get_site_option( 'upload_space_check_disabled' ) )
         return $space_allowed;
 
-    $space_used = get_space_used() * 1024 * 1024;
+    $space_used = get_space_used() * MB_IN_BYTES;
 
     if ( ( $space_allowed - $space_used ) <= 0 )
@@ -2354 +2355 @@
  */
 function upload_size_limit_filter( $size ) {
-    $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
+    $fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
     if ( get_site_option( 'upload_space_check_disabled' ) )
         return min( $size, $fileupload_maxk );