Changeset 33184 for trunk/src/wp-includes/ms-functions.php

Timestamp:

07/13/2015 12:06:39 AM (9 years ago)

Author:

jeremyfelt

Message:

Exclude individual site directories when calculating space used for the main site.

• Add an $exclude parameter to recurse_dirsize().
• Use this parameter in get_dirsize() to exclude /sites when on the main site.
• Add tests for main site and switched site.

Props @earnjam, @jeremyfelt.
Fixes #30202.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (4 diffs)

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

@@ -1687 +1687 @@
  * @since MU
  *
- * @param string $directory
- * @return int
+ * @param string $directory Full path of a directory.
+ * @return int Size of the directory in MB.
  */
 function get_dirsize( $directory ) {
@@ -1698 +1698 @@
         $dirsize = array();
 
-    $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+    // Exclude individual site directories from the total when checking the main site,
+    // as they are subdirectories and should not be counted.
+    if ( is_main_site() ) {
+        $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' );
+    } else {
+        $dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+    }
 
     set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
@@ -1711 +1717 @@
  *
  * @since MU
- *
- * @param string $directory
- * @return int|false
- */
-function recurse_dirsize( $directory ) {
+ * @since 4.3.0 $exclude parameter added.
+ *
+ * @param string $directory Full path of a directory.
+ * @param string $exclude   Optional. Full path of a subdirectory to exclude from the total.
+ * @return int|false Size in MB if a valid directory. False if not.
+ */
+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)) {
@@ -1730 +1739 @@
                     $size += filesize($path);
                 } elseif (is_dir($path)) {
-                    $handlesize = recurse_dirsize($path);
+                    $handlesize = recurse_dirsize( $path, $exclude );
                     if ($handlesize > 0)
                         $size += $handlesize;