Ticket #54483: 54483.2.diff

src/wp-login.php

@@ -228 +228 @@
         }
 
         if ( $wp_error->has_errors() ) {
-                $errors   = '';
-                $messages = '';
+                $errors    = '';
+                $messages  = '';
+                $aria_code = '';
 
                 foreach ( $wp_error->get_error_codes() as $code ) {
                         $severity = $wp_error->get_error_data( $code );
                         foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
                                 if ( 'message' === $severity ) {
                                         $messages .= '  ' . $error_message . "<br />\n";
+                                        $aria_code = ' aria-describedby="' . $code . '"';
                                 } else {
                                         $errors .= '    ' . $error_message . "<br />\n";
                                 }
@@ -261 +263 @@
                          *
                          * @param string $messages Login messages.
                          */
-                        echo '<p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";
+                        echo '<p class="message" ' . $aria_code . '>' . apply_filters( 'login_messages', $messages ) . "</p>\n";
                 }
         }
 } // End of login_header().
@@ -1308 +1310 @@
                 $rememberme = ! empty( $_POST['rememberme'] );
 
                 if ( $errors->has_errors() ) {
-                        $aria_describedby_error = ' aria-describedby="login_error"';
+                        if( isset( $_GET['loggedout'] ) ) {
+                                $aria_describedby_error = ' aria-describedby="loggedout"';
+                        } else {
+                                $aria_describedby_error = ' aria-describedby="login_error"';
+                        }
                 } else {
                         $aria_describedby_error = '';
                 }