Ticket #30202: 30202.2.diff

src/wp-includes/ms-functions.php

@@ -1683 +1683 @@
  * @since MU
  *
  * @param string $directory
+ * @param string $exclude    Optional. Directory to exclude from the total.
  * @return int
  */
-function get_dirsize( $directory ) {
-        $dirsize = get_transient( 'dirsize_cache' );
-        if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
+function get_dirsize( $directory, $exclude = null  ) {
+        // Don't get cache for calls with excludes unless it's the main site
+        if ( ! is_null( $exclude ) || ( is_main_site() && '/sites' === $exclude ) ) {
+                $dirsize = get_transient( 'dirsize_cache' );
+        } else {
+                $dirsize = false;
+        }
+
+        if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) ) {
                 return $dirsize[ $directory ][ 'size' ];
+        }
 
-        if ( ! is_array( $dirsize ) )
+        if ( ! is_array( $dirsize ) ) {
                 $dirsize = array();
+        }
 
-        $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+        $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $exclude );
 
-        set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
+        // Don't cache calls with excludes unless it's the main site
+        if ( ! is_null( $exclude ) || ( is_main_site() && '/sites' === $exclude ) ) {
+                set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
+        }
         return $dirsize[ $directory ][ 'size' ];
 }
 
@@ -1708 +1720 @@
  * @since MU
  *
  * @param string $directory
+ * @param string $exclude   Optional. Directory to exclude from the total.
  * @return int|false
  */
-function recurse_dirsize( $directory ) {
+function recurse_dirsize( $directory, $exclude = null ) {
         $size = 0;
 
         $directory = untrailingslashit( $directory );
 
-        if ( !file_exists($directory) || !is_dir( $directory ) || !is_readable( $directory ) )
+        if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude )  {
                 return false;
+        }
 
-        if ($handle = opendir($directory)) {
-                while(($file = readdir($handle)) !== false) {
-                        $path = $directory.'/'.$file;
-                        if ($file != '.' && $file != '..') {
-                                if (is_file($path)) {
-                                        $size += filesize($path);
-                                } elseif (is_dir($path)) {
-                                        $handlesize = recurse_dirsize($path);
-                                        if ($handlesize > 0)
+        if ( $handle = opendir( $directory ) ) {
+                while( ( $file = readdir( $handle ) ) !== false ) {
+                        $path = $directory . '/' . $file;
+                        if ( $file !== '.' && $file !== '..' ) {
+                                if ( is_file( $path ) ) {
+                                        $size += filesize( $path );
+                                } elseif ( is_dir( $path ) ) {
+                                        $handlesize = recurse_dirsize( $path, $exclude );
+                                        if ( $handlesize > 0 ) {
                                                 $size += $handlesize;
+                                        }
                                 }
                         }
                 }
-                closedir($handle);
+                closedir( $handle );
         }
         return $size;
 }
@@ -2297 +2312 @@
         $space_used = apply_filters( 'pre_get_space_used', false );
         if ( false === $space_used ) {
                 $upload_dir = wp_upload_dir();
-                $space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024;
+                $exclude = ( is_main_site() ) ? $upload_dir['basedir'] . '/sites' : null;
+                $space_used = get_dirsize( $upload_dir['basedir'], $exclude ) / 1024 / 1024; 
         }
 
         return $space_used;

tests/phpunit/tests/multisite/site.php

@@ -11 +11 @@
 class Tests_Multisite_Site extends WP_UnitTestCase {
         protected $suppress = false;
 
+        protected $blog_upload_space;
+
         function setUp() {
                 global $wpdb;
                 parent::setUp();
@@ -17 +19 @@
                 $this->suppress = $wpdb->suppress_errors();
 
                 $_SERVER[ 'REMOTE_ADDR' ] = '';
+
+                if ( ! isset( $this->blog_upload_space ) ) {
+                        $space_used = get_space_used();
+                        $this->blog_upload_space = $space_used + get_site_option( 'blog_upload_space' );
+                }
+                        
+                update_site_option( 'blog_upload_space', $this->blog_upload_space );
         }
 
         function tearDown() {
@@ -1377 +1386 @@
         }
 
         /**
+         * Test that a site's upload space used is actually being counted
+         */
+        function test_get_space_used() {
+                $blog_id = $this->factory->blog->create();
+                switch_to_blog( $blog_id );
+
+                $this->assertEquals( 0, get_space_used() );
+
+                // Upload a file to the new site.
+                $filename = rand_str().'.jpg';
+                $contents = rand_str();
+                $file = wp_upload_bits( $filename, null, $contents );
+
+                // get_space_used() is measures in MB, get size of new file in MB
+                $size = filesize( $file['file'] ) / 1024 / 1024;
+
+                delete_transient( 'dirsize_cache' );
+
+                $this->assertEquals( $size, get_space_used() );
+
+                restore_current_blog();
+        }
+
+        /**
+         * Test that uploads for other sites are excluded from counting towards the space used by the main site
+         */
+        function test_get_space_used_exclude() {
+                $space_used = get_space_used();
+
+                $blog_id = $this->factory->blog->create();
+                switch_to_blog( $blog_id );
+
+                // Upload a file to the new site.
+                $filename = rand_str().'.jpg';
+                $contents = rand_str();
+                wp_upload_bits( $filename, null, $contents );
+
+                restore_current_blog();
+
+                delete_transient( 'dirsize_cache' );
+
+                $this->assertEquals( $space_used, get_space_used() );
+        }
+
+        /**
          * Test the primary purpose of get_blog_post(), to retrieve a post from
          * another site on the network.
          */