Changeset 21474 for trunk/wp-admin/includes/ms.php

Timestamp:

08/08/2012 07:17:33 AM (12 years ago)

Author:

westi

Message:

Multisite: Fix the new get_space_used() function to correctly calculate Megabytes used and update some phpdoc. Props SergeyBiryukov.

File:

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

trunk/wp-admin/includes/ms.php

@@ -303 +303 @@
  * Determines if there is any upload space left in the current blog's quota.
  *
+ * @since 3.0.0
+ *
  * @return int of upload space available in bytes
  */
@@ -332 +334 @@
     $space_allowed = get_space_allowed();
     if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
-        $space_allowed = 10;// Default space allowed is 10 MB
+        $space_allowed = 10; // Default space allowed is 10 MB
 
     $space_used = get_space_used();
 
-    if ( ($space_allowed - $space_used ) < 0 ) {
+    if ( ( $space_allowed - $space_used ) < 0 ) {
         if ( $echo )
             _e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
@@ -345 +347 @@
 }
 
+/**
+ * Returns the space used by the current blog.
+ *
+ * @since 3.5.0
+ *
+ * @return int Used space in megabytes
+ */
 function get_space_used() {
     // Allow for an alternative way of tracking storage space used
     $space_used = apply_filters( 'pre_get_space_used', false );
     if ( false === $space_used )
-        $space_used = get_dirsize( BLOGUPLOADDIR );
+        $space_used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024;
 
     return $space_used;
@@ -357 +366 @@
  * Returns the upload quota for the current blog.
  *
- * @return int Quota
+ * @since MU
+ *
+ * @return int Quota in megabytes
  */
 function get_space_allowed() {
@@ -371 +382 @@
 }
 
+/**
+ * Displays the amount of disk space used by the current blog. Not used in core.
+ *
+ * @since MU
+ */
 function display_space_usage() {
     $space_allowed = get_space_allowed();
@@ -407 +423 @@
 
     $available = get_upload_space_available();
-    return min( $size, $available);
+    return min( $size, $available );
 }