Ticket #46707: 46707.3.diff

src/wp-admin/includes/class-wp-debug-data.php

@@ -1135 +1135 @@
                 }
 
                 // Go through the various installation directories and calculate their sizes.
-                $all_sizes = array(
-                        'wordpress_size' => array(
-                                'path' => ABSPATH,
-                                'size' => 0,
-                        ),
-                        'themes_size'    => array(
-                                'path' => trailingslashit( get_theme_root() ),
-                                'size' => 0,
-                        ),
-                        'plugins_size'   => array(
-                                'path' => trailingslashit( WP_PLUGIN_DIR ),
-                                'size' => 0,
-                        ),
-                        'uploads_size'   => array(
-                                'path' => $upload_dir['basedir'],
-                                'size' => 0,
-                        ),
+                $paths = array(
+                        'wordpress_size' => trailingslashit( ABSPATH ),
+                        'themes_size'    => trailingslashit( get_theme_root() ),
+                        'plugins_size'   => trailingslashit( WP_PLUGIN_DIR ),
+                        'uploads_size'   => trailingslashit( $upload_dir['basedir'] ),
                 );
 
+                $exclude = $paths;
+                unset( $exclude['wordpress_size'] );
+                // recurse_dirsize() expects untrailingslashed.
+                $exclude = array_map( 'untrailingslashit', array_values( $exclude ) );
+
                 $size_total = 0;
+                $all_sizes  = array();
 
                 // Loop over all the directories we want to gather the sizes for.
-                foreach ( $all_sizes as $name => $attributes ) {
+                foreach ( $paths as $name => $path ) {
                         $dir_size = null; // Default to timeout.
+                        $results  = array(
+                                'path' => $path,
+                                'raw'  => 0,
+                        );
 
                         if ( microtime( true ) - WP_START_TIMESTAMP < $max_execution_time ) {
-                                $dir_size = recurse_dirsize( $attributes['path'], null, $max_execution_time );
+                                if ( 'wordpress_size' === $name ) {
+                                        $dir_size = recurse_dirsize( $path, $exclude, $max_execution_time );
+                                } else {
+                                        $dir_size = recurse_dirsize( $path, null, $max_execution_time );
+                                }
                         }
 
                         if ( false === $dir_size ) {
                                 // Error reading.
-                                $all_sizes[ $name ]['size']  = __( 'The size cannot be calculated. The directory is not accessible. Usually caused by invalid permissions.' );
-                                $all_sizes[ $name ]['debug'] = 'not accessible';
+                                $results['size']  = __( 'The size cannot be calculated. The directory is not accessible. Usually caused by invalid permissions.' );
+                                $results['debug'] = 'not accessible';
 
                                 // Stop total size calculation.
                                 $size_total = null;
                         } elseif ( null === $dir_size ) {
                                 // Timeout.
-                                $all_sizes[ $name ]['size']  = __( 'The directory size calculation has timed out. Usually caused by a very large number of sub-directories and files.' );
-                                $all_sizes[ $name ]['debug'] = 'timeout while calculating size';
+                                $results['size']  = __( 'The directory size calculation has timed out. Usually caused by a very large number of sub-directories and files.' );
+                                $results['debug'] = 'timeout while calculating size';
 
                                 // Stop total size calculation.
                                 $size_total = null;
                         } else {
-                                $is_subdir = ( strpos( $attributes['path'], ABSPATH ) === 0 );
-
-                                // phpcs:ignore WordPress.WP.CapitalPDangit.Misspelled
-                                if ( null !== $size_total && ( 'wordpress_size' === $name || ! $is_subdir ) ) {
+                                if ( null !== $size_total ) {
                                         $size_total += $dir_size;
                                 }
 
-                                $all_sizes[ $name ]['size']  = size_format( $dir_size, 2 );
-                                $all_sizes[ $name ]['debug'] = $all_sizes[ $name ]['size'];
+                                $results['raw']   = $dir_size;
+                                $results['size']  = size_format( $dir_size, 2 );
+                                $results['debug'] = $results['size'] . " ({$dir_size} bytes)";
                         }
+
+                        $all_sizes[ $name ] = $results;
                 }
 
                 if ( $size_db > 0 ) {
@@ -1195 +1197 @@
                         $database_size = size_format( $size_db, 2 );
 
                         $all_sizes['database_size'] = array(
+                                'raw'   => $size_db,
                                 'size'  => $database_size,
-                                'debug' => $database_size,
+                                'debug' => $database_size . " ({$size_db} bytes)",
                         );
                 } else {
                         $all_sizes['database_size'] = array(
@@ -1206 +1209 @@
                 }
 
                 if ( null !== $size_total && $size_db > 0 ) {
-                        $total_size = size_format( $size_total + $size_db, 2 );
+                        $total_size = $size_total + $size_db;
+                        $total_size_mb = size_format( $total_size, 2 );
 
                         $all_sizes['total_size'] = array(
-                                'size'  => $total_size,
-                                'debug' => $total_size,
+                                'raw'   => $total_size,
+                                'size'  => $total_size_mb,
+                                'debug' => $total_size_mb . " ({$total_size} bytes)",
                         );
                 } else {
                         $all_sizes['total_size'] = array(

src/wp-includes/functions.php

@@ -7067 +7067 @@
  * @since 4.3.0 $exclude parameter added.
  * @since 5.2.0 $max_execution_time parameter added.
  *
- * @param string $directory Full path of a directory.
- * @param string $exclude   Optional. Full path of a subdirectory to exclude from the total.
- * @param int    $max_execution_time Maximum time to run before giving up. In seconds.
- *                                   The timeout is global and is measured from the moment WordPress started to load.
- * @return int|false|null Size in MB if a valid directory. False if not. Null if timeout.
+ * @param string $directory       Full path of a directory.
+ * @param string|array $exclude   Optional. Full path of a subdirectory to exclude from the total, or array of paths.
+ *                                Expected without trailing slash(es).
+ * @param int $max_execution_time Maximum time to run before giving up. In seconds.
+ *                                The timeout is global and is measured from the moment WordPress started to load.
+ * @return int|false|null Size in bytes if a valid directory. False if not. Null if timeout.
  */
 function recurse_dirsize( $directory, $exclude = null, $max_execution_time = null ) {
         $size = 0;
@@ -7078 +7079 @@
 
         $directory = untrailingslashit( $directory );
 
-        if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) {
+        if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) ) {
                 return false;
         }
 
+        if (
+                ( is_string( $exclude ) && $directory === $exclude ) ||
+                ( is_array( $exclude ) && in_array( $directory, $exclude, true ) )
+        ) {
+                return false;
+        }
+
         if ( $max_execution_time === null ) {
                 // Keep the previous behavior but attempt to prevent fatal errors from timeout if possible.
                 if ( function_exists( 'ini_get' ) ) {