Changeset 57838 for branches/6.5

Timestamp:

03/15/2024 11:17:54 AM (2 years ago)

Author:

swissspidy

Message:

I18N: Improve translation file cache group & expiration.

Adds an explicit 1 hour expiration for the translation file cache introduced in [57287] / #58919.
This prevents stale caches when a site does not use the regular way of installing language packs, for example when an atomic filesystem is involved.
Also configures the translation_files group as a global cache group on multisite.

Reviewed by swissspidy.
Merges [57831] to the to the 6.5 branch.

Props dd32.
Fixes #60764.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-textdomain-registry.php (modified) (3 diffs)
• src/wp-includes/load.php (modified) (1 diff)
• tests/phpunit/tests/l10n/wpTextdomainRegistry.php (modified) (5 diffs)

branches/6.5/src/wp-includes/class-wp-textdomain-registry.php

@@ -184 +184 @@
                 }
 
-                $cache_key = 'cached_mo_files_' . md5( $path );
-                $files     = wp_cache_get( $cache_key, 'translations' );
+                $cache_key = md5( $path );
+                $files     = wp_cache_get( $cache_key, 'translation_files' );
 
                 if ( false === $files ) {
@@ -198 +198 @@
                         }
 
-                        wp_cache_set( $cache_key, $files, 'translations' );
+                        wp_cache_set( $cache_key, $files, 'translation_files', HOUR_IN_SECONDS );
                 }
 
@@ -247 +247 @@
                         switch ( $type ) {
                                 case 'plugin':
-                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins/' ), 'translations' );
+                                        wp_cache_delete( md5( WP_LANG_DIR . '/plugins/' ), 'translation_files' );
                                         break;
                                 case 'theme':
-                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes/' ), 'translations' );
+                                        wp_cache_delete( md5( WP_LANG_DIR . '/themes/' ), 'translation_files' );
                                         break;
                                 default:
-                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/' ), 'translations' );
+                                        wp_cache_delete( md5( WP_LANG_DIR . '/' ), 'translation_files' );
                                         break;
                         }

branches/6.5/src/wp-includes/load.php

@@ -877 +877 @@
                                 'site-transient',
                                 'theme_files',
+                                'translation_files',
                                 'rss',
                                 'users',

branches/6.5/tests/phpunit/tests/l10n/wpTextdomainRegistry.php

@@ -20 +20 @@
 
         public function tear_down() {
-                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/foobar/' ), 'translations' );
-                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins/' ), 'translations' );
-                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes/' ), 'translations' );
-                wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/' ), 'translations' );
+                wp_cache_delete( md5( WP_LANG_DIR . '/foobar/' ), 'translation_files' );
+                wp_cache_delete( md5( WP_LANG_DIR . '/plugins/' ), 'translation_files' );
+                wp_cache_delete( md5( WP_LANG_DIR . '/themes/' ), 'translation_files' );
+                wp_cache_delete( md5( WP_LANG_DIR . '/' ), 'translation_files' );
 
                 parent::tear_down();
@@ -50 +50 @@
                 );
                 $this->assertNotFalse(
-                        wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/bar/' ), 'translations' ),
+                        wp_cache_get( md5( WP_LANG_DIR . '/bar/' ), 'translation_files' ),
                         'List of files in custom path not cached'
                 );
@@ -90 +90 @@
                 $this->instance->get_language_files_from_path( WP_LANG_DIR . '/' );
 
-                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins/' ), 'translations' ) );
-                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes/' ), 'translations' ) );
-                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/foobar/' ), 'translations' ) );
-                $this->assertNotFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/' ), 'translations' ) );
+                $this->assertNotFalse( wp_cache_get( md5( WP_LANG_DIR . '/plugins/' ), 'translation_files' ) );
+                $this->assertNotFalse( wp_cache_get( md5( WP_LANG_DIR . '/themes/' ), 'translation_files' ) );
+                $this->assertNotFalse( wp_cache_get( md5( WP_LANG_DIR . '/foobar/' ), 'translation_files' ) );
+                $this->assertNotFalse( wp_cache_get( md5( WP_LANG_DIR . '/' ), 'translation_files' ) );
         }
 
@@ -104 +104 @@
                 remove_filter( 'pre_get_language_files_from_path', '__return_empty_array' );
 
-                $cache = wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins/' ), 'translations' );
+                $cache = wp_cache_get( md5( WP_LANG_DIR . '/plugins/' ), 'translation_files' );
 
                 $this->assertEmpty( $result );
@@ -145 +145 @@
                 );
 
-                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins/' ), 'translations' ) );
-                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes/' ), 'translations' ) );
-                $this->assertFalse( wp_cache_get( 'cached_mo_files_' . md5( WP_LANG_DIR . '/' ), 'translations' ) );
+                $this->assertFalse( wp_cache_get( md5( WP_LANG_DIR . '/plugins/' ), 'translation_files' ) );
+                $this->assertFalse( wp_cache_get( md5( WP_LANG_DIR . '/themes/' ), 'translation_files' ) );
+                $this->assertFalse( wp_cache_get( md5( WP_LANG_DIR . '/' ), 'translation_files' ) );
         }