Changeset 60890

Timestamp:

10/02/2025 06:13:33 PM (11 months ago)

Author:

westonruter

Message:

Toolbar: Improve conciseness of wp_admin_bar_my_account_item().

Props mukesh27.
Fixes #64060.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (3 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -261 +261 @@
  */
 function wp_admin_bar_my_account_item( $wp_admin_bar ) {
-        $user_id      = get_current_user_id();
-        $current_user = wp_get_current_user();
-
+        $user_id = get_current_user_id();
         if ( ! $user_id ) {
                 return;
@@ -276 +274 @@
         }
 
+        /* translators: %s: Current user's display name. */
+        $howdy = sprintf( __( 'Howdy, %s' ), '<span class="display-name">' . wp_get_current_user()->display_name . '</span>' );
+
         $avatar = get_avatar( $user_id, 26 );
-        /* translators: %s: Current user's display name. */
-        $howdy = sprintf( __( 'Howdy, %s' ), '<span class="display-name">' . $current_user->display_name . '</span>' );
-        $class = empty( $avatar ) ? '' : 'with-avatar';
-
         $wp_admin_bar->add_node(
                 array(
@@ -288 +285 @@
                         'href'   => $profile_url,
                         'meta'   => array(
-                                'class'      => $class,
-                                /* translators: %s: Current user's display name. */
-                                'menu_title' => sprintf( __( 'Howdy, %s' ), $current_user->display_name ),
+                                'class'      => empty( $avatar ) ? '' : 'with-avatar',
+                                'menu_title' => wp_strip_all_tags( $howdy ),
                                 'tabindex'   => ( false !== $profile_url ) ? '' : 0,
                         ),