Changeset 54682 for branches/6.1/src/wp-includes/l10n.php

Timestamp:

10/24/2022 06:35:30 PM (4 years ago)

Author:

ocean90

Message:

I18N: Change how WP_Textdomain_Registry stores the default languages path.

WP_Textdomain_Registry was introduced in [53874] to store text domains and their language directory paths, addressing issues with just-in-time loading of textdomains when using locale switching and when usingload_*_textdomain() functions.

Said change has inadvertently caused a performance regression exactly when usingload_*_textdomain(), which still often is the case, where the cached information was not further used or even overridden.

This change addresses that issue by storing the default languages paths in a separate way, while at the same time making WP_Textdomain_Registry easier to maintain and adding new tests to catch future regressions.

Props flixos90, spacedmonkey, ocean90, SergeyBiryukov, costdev.
Merges [54669] to the 6.1 branch.
See #39210.

Location:

branches/6.1

Files:

• . (modified) (1 prop)
• src/wp-includes/l10n.php (modified) (4 diffs)

branches/6.1/src/wp-includes/l10n.php

@@ -935 +935 @@
         }
 
-        $wp_textdomain_registry->set( $domain, $locale, $path );
+        $wp_textdomain_registry->set_custom_path( $domain, $path );
 
         return load_textdomain( $domain, $path . '/' . $mofile, $locale );
@@ -969 +969 @@
         $path = WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' );
 
-        $wp_textdomain_registry->set( $domain, $locale, $path );
+        $wp_textdomain_registry->set_custom_path( $domain, $path );
 
         return load_textdomain( $domain, $path . '/' . $mofile, $locale );
@@ -1017 +1017 @@
         }
 
-        $wp_textdomain_registry->set( $domain, $locale, $path );
+        $wp_textdomain_registry->set_custom_path( $domain, $path );
 
         return load_textdomain( $domain, $path . '/' . $locale . '.mo', $locale );
@@ -1266 +1266 @@
         }
 
-        if ( $wp_textdomain_registry->has( $domain ) && ! $wp_textdomain_registry->get_current( $domain ) ) {
+        if ( ! $wp_textdomain_registry->has( $domain ) ) {
                 return false;
         }