Changeset 45220 for trunk/src/wp-includes/functions.php

Timestamp:

04/16/2019 11:01:45 PM (5 years ago)

Author:

azaozz

Message:

Site health, info tab:

• Change recurse_dirsize() to accept an array of excluded paths.
• Change so we don't calculate the sizes of dirs in wp-content twice.
• Add the size in bytes to the "debug" into.
• Add a custom DOM event after the dir sizes request is done. Can be used by plugins to "daisy chain" more requests.
• Move "WordPress directory location" and "WordPress directory size" to the top in the "Directories and Sizes" section.
• Move "Theme directory location" to the "Active Theme" section.
• Fix labels capitalization.

Props xkon, afercia, Clorith, azaozz.
Fixes #46707.

File:

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

trunk/src/wp-includes/functions.php

@@ -7072 +7072 @@
  * @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 ) {
@@ -7083 +7084 @@
     $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;
     }