Ticket #30202: 30202.diff

wp-includes/ms-functions.php

@@ -1650 +1650 @@
  * @since MU
  *
  * @param string $directory
+ * @param string $exclude Optional. Directory to exclude from the total.
  * @return int
  */
-function get_dirsize( $directory ) {
+function get_dirsize( $directory, $exclude = null ) {
         $dirsize = get_transient( 'dirsize_cache' );
         if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
                 return $dirsize[ $directory ][ 'size' ];
@@ -1660 +1661 @@
         if ( false == 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 );
         return $dirsize[ $directory ][ 'size' ];
@@ -1675 +1676 @@
  * @since MU
  *
  * @param string $directory
+ * @param string $exclude Optional. Directory to exclude from the total.
  * @return int
  */
-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)) {
@@ -1692 +1694 @@
                                 if (is_file($path)) {
                                         $size += filesize($path);
                                 } elseif (is_dir($path)) {
-                                        $handlesize = recurse_dirsize($path);
+                                        $handlesize = recurse_dirsize( $path, $exclude );
                                         if ($handlesize > 0)
                                                 $size += $handlesize;
                                 }
@@ -2251 +2253 @@
         $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;