Ticket #46349: 46349.4.diff

src/wp-login.php

@@ -92 +92 @@
         <?php
 
         wp_enqueue_style( 'login' );
+        wp_enqueue_style( 'common' );
 
         /*
          * Remove all stored post data on logging out.
@@ -444 +445 @@
         $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
 
         if ( $message && ! wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) {
-                /* translators: URL to support page for resetting your password */
                 $support = __( 'https://wordpress.org/support/article/resetting-your-password/' );
                 $errors->add(
                         'retrieve_password_email_failure',
                         sprintf(
+                                /* translators: %s: URL to support page for resetting your password */
                                 __( '<strong>ERROR</strong>: The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
                                 esc_url( $support )
                         )
@@ -500 +501 @@
 
         $url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
 
-        if ( $url !== get_option( 'siteurl' ) ) {
+        if ( get_option( 'siteurl' ) !== $url ) {
                 update_option( 'siteurl', $url );
         }
 }
@@ -604 +605 @@
                         exit;
                 }
 
-                login_header( __( 'Confirm your admin email' ), '', $errors );
+                login_header( __( 'Confirm your administration email' ), '', $errors );
 
                 /**
                 * Fires before the admin email confirm form.
@@ -635 +636 @@
                                 <?php _e( 'Administration email verification' ); ?>
                         </h1>
                         <p class="admin-email__details">
-                                <?php _e( 'Please verify that the <strong>administration email</strong> for this website is still correct.' ); ?>
+                                <?php _e( 'Please verify that the <strong>administration email</strong> for this website is still correct. This email may be different from your personal email address.' ); ?>
+                        </p>
+                        <p class="admin-email__details">
                                 <?php
 
                                 /* translators: URL to the WordPress help section about admin email. */
@@ -642 +645 @@
                                 $admin_email_help_url = __( 'https://wordpress.org/support/article/settings-general-screen/#email-address' );
 
                                 printf(
-                                        '<a href="%s" rel="noopener noreferrer" target="_blank">%s</a>',
+                                        '<a href="%1$s" rel="noopener noreferrer" target="_blank">%2$s%3$s</a>',
                                         esc_url( $admin_email_help_url ),
-                                        __( 'Why is this important?' )
+                                        __( 'Learn more about the administration email and why it&#8217;s important.' ),
+                                        sprintf(
+                                                '<span class="screen-reader-text"> %s</span>',
+                                                /* translators: accessibility text */
+                                                __( '(opens in a new tab)' )
+                                        )
                                 );
-
                                 ?>
                         </p>
                         <p class="admin-email__details">
                                 <?php
-
                                 printf(
+                                        /* translators: %s: the current administration email */
                                         __( 'Current administration email: <strong>%s</strong>' ),
                                         esc_html( $admin_email )
                                 );
-
                                 ?>
                         </p>
-                        <p class="admin-email__details">
-                                <?php _e( 'This email may be different from your personal email address.' ); ?>
-                                <?php
 
-                                printf(
-                                        '<a href="%s" rel="noopener noreferrer" target="_blank">%s</a>',
-                                        esc_url( $admin_email_help_url ),
-                                        __( 'Learn more.' )
-                                );
-
-                                ?>
-                        </p>
-
                         <div class="admin-email__actions">
                                 <div class="admin-email__actions-primary">
                                         <?php
@@ -1251 +1245 @@
                                 }
                         }
 
-                        if ( ( empty( $redirect_to ) || $redirect_to === 'wp-admin/' || $redirect_to == admin_url() ) ) {
+                        if ( ( empty( $redirect_to ) || 'wp-admin/' === $redirect_to || admin_url() == $redirect_to ) ) {
                                 // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
                                 if ( is_multisite() && ! get_active_blog_for_user( $user->ID ) && ! is_super_admin( $user->ID ) ) {
                                         $redirect_to = user_admin_url();