mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-06-04 17:55:53 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Multisite: Rename the calculate_current_dirsize filter to pre_recurse_dirsize.

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@49629 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-11-17 15:42:57 +00:00
parent 025ad3469b
commit 205c025c63
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wp-includes/functions.php
View File

@ -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.

1
src/wp-includes/ms-functions.php
View File

@ -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;

8
tests/phpunit/tests/multisite/cleanDirsizeCache.php
View File

@ -219,16 +219,16 @@ if ( is_multisite() ) :
*
* @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' ) );
remove_filter( 'pre_recurse_dirsize', array( $this, '_filter_pre_recurse_dirsize' ) );
}
function _filter_calculate_current_dirsize() {
function _filter_pre_recurse_dirsize() {
return 1042;
}