Ticket #43633: 43633.3.diff

src/wp-includes/admin-bar.php

@@ -291 +291 @@
         $user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
 
         if ( $current_user->display_name !== $current_user->user_login ) {
-                $user_info .= "<span class='username'>{$current_user->user_login}</span>";
+                $user_info .= "<span class='username' aria-hidden='true'>{$current_user->user_login}</span>";
         }
 
+        if ( false !== $profile_url ) {
+                $user_info .= "<span class='display-name edit-profile-link'>" . __( 'Edit Profile' ) . "</span>";
+        }
+
         $wp_admin_bar->add_node(
                 array(
                         'parent' => 'user-actions',
@@ -300 +304 @@
                         'id'     => 'user-info',
                         'title'  => $user_info,
                         'href'   => $profile_url,
-                        'meta'   => array(
-                                'tabindex' => -1,
-                        ),
                 )
         );
 
-        if ( false !== $profile_url ) {
-                $wp_admin_bar->add_node(
-                        array(
-                                'parent' => 'user-actions',
-                                'id'     => 'edit-profile',
-                                'title'  => __( 'Edit Profile' ),
-                                'href'   => $profile_url,
-                        )
-                );
-        }
-
         $wp_admin_bar->add_node(
                 array(
                         'parent' => 'user-actions',