Changeset 19201 for trunk/wp-includes/admin-bar.php

Timestamp:

11/07/2011 05:27:24 PM (15 years ago)

Author:

nacin

Message:

Clean up wp_admin_bar_my_account_menu() a bit. see #19193.

File:

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

trunk/wp-includes/admin-bar.php

@@ -145 +145 @@
         $user_id      = get_current_user_id();
         $current_user = wp_get_current_user();
+        $profile_url  = get_edit_profile_url( $user_id );
 
         if ( 0 != $user_id ) {
                 /* Add the 'My Account' menu */
-                $avatar = get_avatar( get_current_user_id(), 28 );
+                $avatar = get_avatar( $user_id, 28 );
                 $howdy  = sprintf( __('Howdy, %1$s'), $user_identity );
                 $class  = 'opposite';
@@ -158 +159 @@
                         'id'    => 'my-account',
                         'title' => $howdy . $avatar,
-                        'href'  => get_edit_profile_url( $user_id ),
+                        'href'  => $profile_url,
                         'meta'  => array(
                                 'class' => $class,
@@ -166 +167 @@
                 /* Add the "My Account" sub menus */
 
-
-
-                $user_info  = get_avatar( get_current_user_id(), 64 );
+                $user_info  = get_avatar( $user_id, 64 );
                 $user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
 
@@ -178 +177 @@
                         'id'     => 'user-info',
                         'title'  => $user_info,
-                        'href'   => get_edit_profile_url( $user_id ),
+                        'href'   => $profile_url,
                         'meta'   => array(
-                                'class' => 'user-info user-info-item'
+                                'class' => 'user-info user-info-item',
                         ),
                 ) );
@@ -187 +186 @@
                         'id'     => 'edit-profile',
                         'title'  => __( 'Edit My Profile' ),
-                        'href' => get_edit_profile_url( $user_id ),
+                        'href' => $profile_url,
                         'meta'   => array(
                                 'class' => 'user-info-item',