Changeset 14420

Timestamp:

05/03/2010 10:40:02 PM (15 years ago)

Author:

wpmuguru

Message:

limit upload size to site's available limit, see #12853

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-includes/ms-default-filters.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -400 +400 @@
         return true;
 
-    $space_allowed = get_space_allowed();
+    if ( !( $space_allowed = get_upload_space_available() ) )
+        return false;
+
+    return true;
+}
+
+function upload_size_limit_filter( $size ) {
+    return min( $size, get_upload_space_available() );
+}
+/**
+ * Determines if there is any upload space left in the current blog's quota.
+ *
+ * @return int of upload space available in bytes
+ */
+function get_upload_space_available() {
+    $space_allowed = get_space_allowed() * 1024 * 1024;
+    if ( get_site_option( 'upload_space_check_disabled' ) )
+        return $space_allowed;
 
     $dir_name = trailingslashit( BLOGUPLOADDIR );
     if ( !( is_dir( $dir_name) && is_readable( $dir_name ) ) )
-        return true;
+        return $space_allowed;
 
     $dir = dir( $dir_name );
@@ -419 +436 @@
     }
     $dir->close();
-    $size = $size / 1024 / 1024;
 
     if ( ( $space_allowed - $size ) <= 0 )
-        return false;
-
-    return true;
+        return 0;
+
+    return $space_allowed - $size;
 }
 

trunk/wp-includes/ms-default-filters.php

@@ -46 +46 @@
 add_filter( 'upload_mimes', 'check_upload_mimes' );
 add_action( 'admin_notices', 'ms_deprecated_blogs_file' );
+add_action( 'upload_size_limit', 'upload_size_limit_filter' );
 
 // Mail