From 2cf99872e8d7fddec6c8371b59e563c39631bf18 Mon Sep 17 00:00:00 2001 From: Mukesh Panchal Date: Wed, 1 Oct 2025 11:22:55 +0530 Subject: [PATCH 1/2] Refactor wp_admin_bar_my_account_item function --- src/wp-includes/admin-bar.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php index c129964da469b..77dd95b901e1c 100644 --- a/src/wp-includes/admin-bar.php +++ b/src/wp-includes/admin-bar.php @@ -260,8 +260,7 @@ function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) { * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance. */ 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; @@ -275,10 +274,11 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) { $profile_url = false; } - $avatar = get_avatar( $user_id, 26 ); + $avatar = get_avatar( $user_id, 26 ); + $current_user = wp_get_current_user(); + /* translators: %s: Current user's display name. */ $howdy = sprintf( __( 'Howdy, %s' ), '' . $current_user->display_name . '' ); - $class = empty( $avatar ) ? '' : 'with-avatar'; $wp_admin_bar->add_node( array( @@ -287,9 +287,8 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) { 'title' => $howdy . $avatar, 'href' => $profile_url, 'meta' => array( - 'class' => $class, - /* translators: %s: Current user's display name. */ - 'menu_title' => sprintf( __( 'Howdy, %s' ), $current_user->display_name ), + 'class' => ( false === $avatar ) ? '' : 'with-avatar', + 'menu_title' => wp_strip_all_tags( $howdy ), 'tabindex' => ( false !== $profile_url ) ? '' : 0, ), ) From 100f2ab2ccfccaf28759b172720cab1916431213 Mon Sep 17 00:00:00 2001 From: Mukesh Panchal Date: Thu, 2 Oct 2025 10:04:09 +0530 Subject: [PATCH 2/2] Revert avatar class condition check --- src/wp-includes/admin-bar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php index 77dd95b901e1c..eb4295c91d511 100644 --- a/src/wp-includes/admin-bar.php +++ b/src/wp-includes/admin-bar.php @@ -287,7 +287,7 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) { 'title' => $howdy . $avatar, 'href' => $profile_url, 'meta' => array( - 'class' => ( false === $avatar ) ? '' : 'with-avatar', + 'class' => empty( $avatar ) ? '' : 'with-avatar', 'menu_title' => wp_strip_all_tags( $howdy ), 'tabindex' => ( false !== $profile_url ) ? '' : 0, ),