Changeset 54795 for branches/6.1/src/wp-includes/load.php

Timestamp:

11/10/2022 07:19:11 PM (2 years ago)

Author:

ocean90

Message:

I18N : Always pass $locale to load_textdomain().

In [53874] the optional $locale parameter was added to load_textdomain(). While most load_textdomain() calls in core were were updated, some were missed. Passing the original locale avoids the need to call determine_locale() by load_textdomain() which is used as a fallback.

Props ocean90, swissspidy, desrosj.
Fixes #57060.

File:

• branches/6.1/src/wp-includes/load.php (modified) (1 diff)

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

@@ -1393 +1393 @@
             foreach ( $locations as $location ) {
                 if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
-                    load_textdomain( 'default', $location . '/' . $locale . '.mo' );
+                    load_textdomain( 'default', $location . '/' . $locale . '.mo', $locale );
                     if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) ) {
-                        load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+                        load_textdomain( 'default', $location . '/admin-' . $locale . '.mo', $locale );
                     }
                     break 2;