From afbd46517ae32982e6a45ab29f5d597c8e9955f2 Mon Sep 17 00:00:00 2001 From: Peter Westwood Date: Thu, 11 Nov 2010 11:49:37 +0000 Subject: [PATCH] Don't show duff links if someone decides that they want the admin bar for all users - even those who are logged out. git-svn-id: https://develop.svn.wordpress.org/trunk@16291 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/admin-bar.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 7e6b6abc70..ab3806d86b 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -71,7 +71,9 @@ add_action( 'admin_footer', 'wp_admin_bar_render', 1000 ); */ function wp_admin_bar_me_separator() { global $wp_admin_bar; - $wp_admin_bar->add_menu( array( 'id' => 'me', 'title' => get_avatar( get_current_user_id(), 16 ), 'href' => get_edit_profile_url( get_current_user_id() ), ) ); + $user_id = get_current_user_id(); + if ( 0 != $user_id ) + $wp_admin_bar->add_menu( array( 'id' => 'me', 'title' => get_avatar( get_current_user_id(), 16 ), 'href' => get_edit_profile_url( $user_id ), ) ); } /** @@ -83,17 +85,19 @@ function wp_admin_bar_my_account_menu() { global $wp_admin_bar, $user_identity; $user_id = get_current_user_id(); - - /* Add the 'My Account' menu */ - $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity, 'href' => get_edit_profile_url( $user_id ) ) ); - - /* Add the "My Account" sub menus */ - $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) ); - if ( is_multisite() ) - $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ), ) ); - else - $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Dashboard' ), 'href' => admin_url(), ) ); - $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Log Out' ), 'href' => wp_logout_url(), ) ); + + if ( 0 != $user_id ) { + /* Add the 'My Account' menu */ + $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity, 'href' => get_edit_profile_url( $user_id ) ) ); + + /* Add the "My Account" sub menus */ + $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) ); + if ( is_multisite() ) + $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ), ) ); + else + $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Dashboard' ), 'href' => admin_url(), ) ); + $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Log Out' ), 'href' => wp_logout_url(), ) ); + } } /**