Changeset 16291

Timestamp:

11/11/2010 11:49:37 AM (14 years ago)

Author:

westi

Message:

Don't show duff links if someone decides that they want the admin bar for all users - even those who are logged out.

File:

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

trunk/wp-includes/admin-bar.php

@@ -72 +72 @@
 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 ), ) );
 }
 
@@ -84 +86 @@
 
     $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(), ) );
+    }
 }