Changeset 49616

Timestamp:

11/16/2020 10:29:42 PM (4 years ago)

Author:

helen

Message:

Multisite: More consistency for clean_dirsize_cache().

Props SergeyBiryukov.
Fixes #19879.

Location:

trunk

Files:

• src/wp-admin/includes/file.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (5 diffs)
• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/multisite/cleanDirsizeCache.php (added)
• tests/phpunit/tests/multisite/dirsizeCache.php (deleted)

trunk/src/wp-admin/includes/file.php

@@ -929 +929 @@
 
     if ( is_multisite() ) {
-        invalidate_dirsize_cache( $new_file );
+        clean_dirsize_cache( $new_file );
     }
 

trunk/src/wp-includes/functions.php

@@ -2748 +2748 @@
 
     if ( is_multisite() ) {
-        invalidate_dirsize_cache( $new_file );
+        clean_dirsize_cache( $new_file );
     }
 
@@ -7629 +7629 @@
 
     $directory  = untrailingslashit( $directory );
-    $cache_path = normalize_dirsize_cache_path( $directory );
+    $cache_path = untrailingslashit( str_replace( ABSPATH, '', $directory ) );
+
     $save_cache = false;
 
@@ -7723 +7724 @@
  * @param string $path Full path of a directory or file.
  */
-function invalidate_dirsize_cache( $path ) {
+function clean_dirsize_cache( $path ) {
     $directory_cache = get_transient( 'dirsize_cache' );
 
@@ -7730 +7731 @@
     }
 
-    $cache_path = normalize_dirsize_cache_path( $path );
+    $cache_path = untrailingslashit( str_replace( ABSPATH, '', $path ) );
     unset( $directory_cache[ $cache_path ] );
 
@@ -7739 +7740 @@
 
     set_transient( 'dirsize_cache', $directory_cache );
-}
-
-/**
- * Normalize dirsize cache path.
- *
- * Ensures array keys within the dirsize_cache transient follow the same format.
- *
- * @since 5.6.0
- *
- * @param string $path
- * @return string
- */
-function normalize_dirsize_cache_path( $path ) {
-    $path = str_replace( ABSPATH, '', $path );
-
-    return untrailingslashit( $path );
 }
 

trunk/src/wp-includes/post.php

@@ -5919 +5919 @@
 
     if ( is_multisite() ) {
-        invalidate_dirsize_cache( $file );
+        clean_dirsize_cache( $file );
     }