Ticket #58317: l10n.php.patch

wp-includes/l10n.php

@@ -132 +132 @@
          */
         $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 (
+                   is_admin()
+                || ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() )
+        ) {
                 $determined_locale = get_user_locale();
+        } else {
+                $determined_locale = get_locale();
         }
 
-        if ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() ) {
-                $determined_locale = get_user_locale();
+        if ( isset( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
+                if ( ! empty( $_GET['wp_lang'] ) ) {
+                        $determined_locale = sanitize_text_field( $_GET['wp_lang'] ) ?: $determined_locale;
+                } elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
+                        $determined_locale = sanitize_text_field( $_COOKIE['wp_lang'] ) ?: $determined_locale;
+                }
         }
 
-        $wp_lang = '';
-
-        if ( ! empty( $_GET['wp_lang'] ) ) {
-                $wp_lang = sanitize_text_field( $_GET['wp_lang'] );
-        } elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
-                $wp_lang = sanitize_text_field( $_COOKIE['wp_lang'] );
-        }
-
-        if ( ! empty( $wp_lang ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
-                $determined_locale = $wp_lang;
-        }
-
         /**
          * Filters the locale for the current request.
          *