Changeset 57299

Timestamp:

01/16/2024 09:43:11 PM (3 years ago)

Author:

SergeyBiryukov

Message:

I18N: Correctly invalidate language file paths in WP_Textdomain_Registry.

Since the cache key in ::get_language_files_from_path() is based on a path that always includes a trailing slash, the path in ::invalidate_mo_files_cache() should include the trailing slash as well.

Includes adjusting the test expectations accordingly.

Follow-up to [57287], [57290], [57298].

See #58919.

Location:

trunk

Files:

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

trunk/src/wp-includes/class-wp-textdomain-registry.php

@@ -238 +238 @@
                         switch ( $type ) {
                                 case 'plugin':
-                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins' ), 'translations' );
+                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins/' ), 'translations' );
                                         break;
                                 case 'theme':
-                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes' ), 'translations' );
+                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/themes/' ), 'translations' );
                                         break;
                                 default:
-                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR ), 'translations' );
+                                        wp_cache_delete( 'cached_mo_files_' . md5( WP_LANG_DIR . '/' ), 'translations' );
                                         break;
                         }

trunk/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( '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' );
 
                 parent::tear_down();
@@ -101 +101 @@
         public function test_get_language_files_from_path_short_circuit() {
                 add_filter( 'pre_get_language_files_from_path', '__return_empty_array' );
-                $result = $this->instance->get_language_files_from_path( WP_LANG_DIR . '/plugins' );
+                $result = $this->instance->get_language_files_from_path( WP_LANG_DIR . '/plugins/' );
                 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( 'cached_mo_files_' . md5( WP_LANG_DIR . '/plugins/' ), 'translations' );
 
                 $this->assertEmpty( $result );
@@ -114 +114 @@
          */
         public function test_invalidate_mo_files_cache() {
-                $this->instance->get_language_files_from_path( WP_LANG_DIR . '/plugins' );
-                $this->instance->get_language_files_from_path( WP_LANG_DIR . '/themes' );
-                $this->instance->get_language_files_from_path( WP_LANG_DIR );
+                $this->instance->get_language_files_from_path( WP_LANG_DIR . '/plugins/' );
+                $this->instance->get_language_files_from_path( WP_LANG_DIR . '/themes/' );
+                $this->instance->get_language_files_from_path( WP_LANG_DIR . '/' );
 
                 $this->instance->invalidate_mo_files_cache(
@@ -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( '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' ) );
         }