Changeset 44134 for trunk/src/wp-login.php

Timestamp:

12/14/2018 01:31:27 AM (8 years ago)

Author:

jeremyfelt

Message:

REST API: Render response in user locale with ?_locale=user.

Introduces new determine_locale() function for deciding the proper locale to use for a response. Default value is get_user_locale() in the admin, and get_locale() on the frontend. Because REST API requests are considered frontend requests, ?_locale=user can be used to render the response in the user's locale.

Also updates wp-login.php?wp_lang implementation to benefit from this abstraction.

Merges [43776] from the 5.0 branch to trunk.

Props flixos90, mnelson4, swissspidy, TimothyBlynJacobs.
Fixes #44758.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-login.php (modified) (7 diffs)

trunk/src/wp-login.php

@@ -465 +465 @@
 }
 
-$lang            = ! empty( $_GET['wp_lang'] ) ? sanitize_text_field( $_GET['wp_lang'] ) : '';
-$switched_locale = switch_to_locale( $lang );
-
 /**
  * Fires when the login form is initialized.
@@ -528 +525 @@
                 setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
 
-                if ( $switched_locale ) {
-                        restore_previous_locale();
-                }
-
                 wp_safe_redirect( wp_get_referer() );
                 exit();
@@ -547 +540 @@
                         $redirect_to           = 'wp-login.php?loggedout=true';
                         $requested_redirect_to = '';
-                }
-
-                if ( $switched_locale ) {
-                        restore_previous_locale();
                 }
 
@@ -649 +638 @@
                 <?php
                 login_footer( 'user_login' );
-
-                if ( $switched_locale ) {
-                        restore_previous_locale();
-                }
 
                 break;
@@ -781 +766 @@
                 login_footer( 'user_pass' );
 
-                if ( $switched_locale ) {
-                        restore_previous_locale();
-                }
-
                 break;
 
@@ -867 +848 @@
                 <?php
                 login_footer( 'user_login' );
-
-                if ( $switched_locale ) {
-                        restore_previous_locale();
-                }
 
                 break;
@@ -1180 +1157 @@
                 login_footer();
 
-                if ( $switched_locale ) {
-                        restore_previous_locale();
-                }
-
                 break;
 } // End action switch.