diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 81ed9bc130..e7f2d8a264 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -7624,8 +7624,6 @@ function get_dirsize( $directory, $max_execution_time = null ) { * @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, &$directory_cache = null ) { - $size = 0; - $directory = untrailingslashit( $directory ); $cache_path = untrailingslashit( str_replace( ABSPATH, '', $directory ) ); @@ -7674,11 +7672,13 @@ function recurse_dirsize( $directory, $exclude = null, $max_execution_time = nul * * @since 5.6.0 * - * @param int|false $space_used The amount of used space, in bytes. Default 0. + * @param int|false $space_used The amount of used space, in bytes. Default false. */ - $size = apply_filters( 'calculate_current_dirsize', $size, $directory, $exclude, $max_execution_time, $directory_cache ); + $size = apply_filters( 'pre_recurse_dirsize', false, $directory, $exclude, $max_execution_time, $directory_cache ); + + if ( false === $size ) { + $size = 0; - if ( 0 === $size ) { $handle = opendir( $directory ); if ( $handle ) { while ( ( $file = readdir( $handle ) ) !== false ) { @@ -7703,6 +7703,7 @@ function recurse_dirsize( $directory, $exclude = null, $max_execution_time = nul closedir( $handle ); } } + $directory_cache[ $cache_path ] = $size; // Only write the transient on the top level call and not on recursive calls. diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 19d644d26e..13704115f2 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -2629,6 +2629,7 @@ function get_space_used() { * @param int|false $space_used The amount of used space, in megabytes. Default false. */ $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'] ) / MB_IN_BYTES; diff --git a/wp-includes/version.php b/wp-includes/version.php index 61bb8a7c62..5fa493a603 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-beta4-49628'; +$wp_version = '5.6-beta4-49629'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.