Changeset 55161 for trunk/src/wp-includes/ms-functions.php

Timestamp:

01/30/2023 10:25:53 AM (4 years ago)

Author:

swissspidy

Message:

I18N: Introduce switch_to_user_locale().

This new function makes it easier to switch to a specific user’s locale by reducing duplicate code and storing the user’s ID as additional context for plugins to consume. Existing usage of switch_to_locale() in core has been replaced with switch_to_user_locale() where appropriate.

Also, this change ensures WP_Locale_Switcher properly filters determine_locale so that anyyone using the determine_locale() function will get the correct locale information when switching is in effect.

Props costdev.
Fixes #57123.
See #26511.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (6 diffs)

trunk/src/wp-includes/ms-functions.php

@@ -955 +955 @@
 
         $user            = get_user_by( 'login', $user_login );
-        $switched_locale = switch_to_locale( get_user_locale( $user ) );
+        $switched_locale = $user && switch_to_user_locale( $user->ID );
 
         $message = sprintf(
@@ -1069 +1069 @@
 
         $user            = get_user_by( 'login', $user_login );
-        $switched_locale = switch_to_locale( get_user_locale( $user ) );
+        $switched_locale = $user && switch_to_user_locale( $user->ID );
 
         // Send email with activation link.
@@ -1611 +1611 @@
         $user = get_userdata( $user_id );
 
-        $switched_locale = switch_to_locale( get_user_locale( $user ) );
+        $switched_locale = switch_to_user_locale( $user_id );
 
         $welcome_email = get_site_option( 'welcome_email' );
@@ -1735 +1735 @@
         if ( $network_admin ) {
                 // If the network admin email address corresponds to a user, switch to their locale.
-                $switched_locale = switch_to_locale( get_user_locale( $network_admin ) );
+                $switched_locale = switch_to_user_locale( $network_admin->ID );
         } else {
                 // Otherwise switch to the locale of the current site.
@@ -1844 +1844 @@
         $user = get_userdata( $user_id );
 
-        $switched_locale = switch_to_locale( get_user_locale( $user ) );
+        $switched_locale = switch_to_user_locale( $user_id );
 
         /**
@@ -2727 +2727 @@
         update_site_option( 'network_admin_hash', $new_admin_email );
 
-        $switched_locale = switch_to_locale( get_user_locale() );
+        $switched_locale = switch_to_user_locale( get_current_user_id() );
 
         /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */