Changeset 49629

Timestamp:

11/17/2020 03:42:57 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Multisite: Rename the calculate_current_dirsize filter to pre_recurse_dirsize.

Set the default value to false. This brings some consistency with the pre_get_space_used filter.

Follow-up to [49212], [49616], [49628].

See #19879.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (3 diffs)
• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/multisite/cleanDirsizeCache.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -7625 +7625 @@
  */
 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 ) );
@@ -7675 +7673 @@
          * @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 );
-
-        if ( 0 === $size ) {
+        $size = apply_filters( 'pre_recurse_dirsize', false, $directory, $exclude, $max_execution_time, $directory_cache );
+
+        if ( false === $size ) {
+                $size = 0;
+
                 $handle = opendir( $directory );
                 if ( $handle ) {
@@ -7704 +7704 @@
                 }
         }
+
         $directory_cache[ $cache_path ] = $size;
 

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

@@ -2630 +2630 @@
          */
         $space_used = apply_filters( 'pre_get_space_used', false );
+
         if ( false === $space_used ) {
                 $upload_dir = wp_upload_dir();

trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php

@@ -220 +220 @@
                  * @ticket 19879
                  */
-                function test_recurse_dirsize_calculate_current_dirsize_filter() {
-                        add_filter( 'calculate_current_dirsize', array( $this, '_filter_calculate_current_dirsize' ) );
+                function test_pre_recurse_dirsize_filter() {
+                        add_filter( 'pre_recurse_dirsize', array( $this, '_filter_pre_recurse_dirsize' ) );
 
                         $upload_dir = wp_upload_dir();
                         $this->assertSame( 1042, recurse_dirsize( $upload_dir['path'] ) );
 
-                        remove_filter( 'calculate_current_dirsize', array( $this, '_filter_calculate_current_dirsize' ) );
-                }
-
-                function _filter_calculate_current_dirsize() {
+                        remove_filter( 'pre_recurse_dirsize', array( $this, '_filter_pre_recurse_dirsize' ) );
+                }
+
+                function _filter_pre_recurse_dirsize() {
                         return 1042;
                 }