Support for upcoming changes to the admin bar in WordPress 3.3.

git-svn-id: http://plugins.svn.wordpress.org/user-switching/trunk@449649 b8457f37-d9ea-0310-8a92-e5e31aec5664

Author: johnbillion

readme.txt

@@ -3,7 +3,7 @@ Contributors: johnbillion
 Donate link: http://lud.icro.us/donations/
 Tags: user, users, profiles, switching, wpmu, multisite, buddypress
 Requires at least: 2.7
-Tested up to: 3.2.1
+Tested up to: 3.3
 Stable tag: trunk
 
 Instant switching between user accounts in WordPress, WordPress Multisite, BuddyPress and WordPress MU.
@@ -59,6 +59,9 @@ Yes, except you'll need to install 'user-switching.php' into the root of your mu
 
 == Changelog ==
 
+= 0.4.1 =
+* Support for upcoming changes to the admin bar in WordPress 3.3.
+
 = 0.4 =
 * Add some extended support for BuddyPress.
 * Add some extended support for Multisite.
@@ -90,5 +93,8 @@ Yes, except you'll need to install 'user-switching.php' into the root of your mu
 
 == Upgrade Notice ==
 
+= 0.4.1 =
+* Support for upcoming changes to the admin bar in WordPress 3.3.
+
 = 0.4 =
 User switching links on Network Admin screens and BuddyPress user screens.

user-switching.php

@@ -2,7 +2,7 @@
 /*
 Plugin Name:  User Switching
 Description:  Instant switching between user accounts in WordPress
-Version:      0.4
+Version:      0.4.1
 Plugin URI:   http://lud.icro.us/wordpress-plugin-user-switching/
 Author:       John Blackbourn
 Author URI:   http://johnblackbourn.com/
@@ -150,13 +150,14 @@ function admin_bar_menu() {
 
 		if ( $old_user = $this->get_old_user() ) {
 
-			$parent = get_option( 'show_avatars' ) ? 'my-account-with-avatar' : 'my-account';
+			foreach ( array( 'my-account-with-avatar', 'my-account' ) as $parent ) {
+				$wp_admin_bar->add_menu( array(
+					'parent' => $parent,
+					'title'  => sprintf( __( 'Switch back to %1$s (%2$s)', 'user_switching' ), $old_user->display_name, $old_user->user_login ),
+					'href'   => $this->switch_back_url()
+				) );
+			}
 
-			$wp_admin_bar->add_menu( array(
-				'parent' => $parent,
-				'title'  => sprintf( __( 'Switch back to %1$s (%2$s)', 'user_switching' ), $old_user->display_name, $old_user->user_login ),
-				'href'   => $this->switch_back_url()
-			) );
 		}
 
 	}