Changeset 55862

Timestamp:

05/26/2023 05:55:40 PM (12 days ago)

Author:

swissspidy

Message:

I18N: Refactor determine_locale() for performance and readability.

Refactors the function to avoid unnecessary get_locale() calls and slightly improve performance, while keeping it readable.

Adds tests.

Props Cybr, spacedmonkey, swissspidy.
Fixes #58317.

Location:

trunk

Files:

• src/wp-includes/l10n.php (modified) (1 diff)
• tests/phpunit/tests/l10n/determineLocale.php (added)

trunk/src/wp-includes/l10n.php

@@ -133 +133 @@
     $determined_locale = apply_filters( 'pre_determine_locale', null );
 
-    if ( ! empty( $determined_locale ) && is_string( $determined_locale ) ) {
+    if ( $determined_locale && is_string( $determined_locale ) ) {
         return $determined_locale;
     }
 
-    $determined_locale = get_locale();
-
-    if ( is_admin() ) {
+    if (
+        isset( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] &&
+        ( ! empty( $_GET['wp_lang'] ) || ! empty( $_COOKIE['wp_lang'] ) )
+    ) {
+        if ( ! empty( $_GET['wp_lang'] ) ) {
+            $determined_locale = sanitize_locale_name( $_GET['wp_lang'] );
+        } else {
+            $determined_locale = sanitize_locale_name( $_COOKIE['wp_lang'] );
+        }
+    } else if (
+        ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() ) ||
+        is_admin()
+    ) {
         $determined_locale = get_user_locale();
-    }
-
-    if ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() ) {
-        $determined_locale = get_user_locale();
-    }
-
-    $wp_lang = '';
-
-    if ( ! empty( $_GET['wp_lang'] ) ) {
-        $wp_lang = sanitize_locale_name( wp_unslash( $_GET['wp_lang'] ) );
-    } elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
-        $wp_lang = sanitize_locale_name( wp_unslash( $_COOKIE['wp_lang'] ) );
-    }
-
-    if ( ! empty( $wp_lang ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
-        $determined_locale = $wp_lang;
+    } else {
+        $determined_locale = get_locale();
     }