Changeset 12571

Timestamp:

05/04/2023 02:45:09 AM (3 years ago)

Author:

dd32

Message:

Login: Hide the custom language switcher on 2FA prompt screens, as it causes the 2FA login flow to break.

This moves the wp-login.php display of the langauge selector to being output from the core 'should the language switcher be displayed' filter, rather than on the following login_footer.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php

@@ -52 +52 @@
  */
 add_filter( 'show_admin_bar', '__return_false', 101 );
-
-/**
- * Disable the Core Language Selector on wp-login.php.
- */
-add_filter( 'login_display_language_dropdown', '__return_false' );
 
 /**
@@ -320 +315 @@
  * Note: See the 'Locale Detection' plugin for the switching of the locale.
  */
-function wporg_login_language_switcher() {
+function wporg_login_language_switcher( $display = true ) {
         $current_locale = get_locale();
+
+        /*
+         * If something has explicitely disabled the switcher, don't show our version either.
+         * This is used for when we're called from the 'login_display_language_dropdown' filter.
+         */
+        if ( ! $display ) {
+                return $display;
+        }
 
         ?>
@@ -355 +358 @@
         </script>
         <?php
-}
-add_action( 'wp_footer', 'wporg_login_language_switcher', 1 );
-add_action( 'login_footer', 'wporg_login_language_switcher', 1 );
+
+        return false; // For the login_display_language_dropdown filter.
+}
+add_action( 'wp_footer', 'wporg_login_language_switcher', 1, 0 );
+add_action( 'login_display_language_dropdown', 'wporg_login_language_switcher', 20 );
 
 /**