Changeset 31871

Timestamp:

03/24/2015 04:28:56 PM (10 years ago)

Author:

johnbillion

Message:

Implement an aria-describedby attribute for login screen errors, and improve the "Forgot password?" anchor text.

Props aferica, rianrietveld
Fixes #31143

Location:

trunk/src

Files:

• wp-includes/user.php (modified) (2 diffs)
• wp-login.php (modified) (2 diffs)

trunk/src/wp-includes/user.php

@@ -135 +135 @@
 
     if ( !$user )
-        return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s">Lost your password</a>?' ), wp_lostpassword_url() ) );
+        return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s">Lost your password?</a>' ), wp_lostpassword_url() ) );
 
     /**
@@ -151 +151 @@
 
     if ( !wp_check_password($password, $user->user_pass, $user->ID) )
-        return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s">Lost your password</a>?' ),
+        return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s">Lost your password?</a>' ),
         $username, wp_lostpassword_url() ) );
 

trunk/src/wp-login.php

@@ -890 +890 @@
         $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
     $rememberme = ! empty( $_POST['rememberme'] );
+
+    if ( ! empty( $errors->errors ) ) {
+        $aria_describedby_error = ' aria-describedby="login_error"';
+    } else {
+        $aria_describedby_error = '';
+    }
 ?>
 
@@ -895 +901 @@
     <p>
         <label for="user_login"><?php _e('Username') ?><br />
-        <input type="text" name="log" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
+        <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label>
     </p>
     <p>
         <label for="user_pass"><?php _e('Password') ?><br />
-        <input type="password" name="pwd" id="user_pass" class="input" value="" size="20" /></label>
+        <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
     </p>
     <?php