Index: wp-includes/admin-bar.php
===================================================================
--- wp-includes/admin-bar.php	(revision 19626)
+++ wp-includes/admin-bar.php	(working copy)
@@ -72,7 +72,7 @@
  * @since 3.3.0
  */
 function wp_admin_bar_wp_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id'    => 'wp-logo',
 		'title' => '<span class="ab-icon"></span>',
 		'href'  => admin_url( 'about.php' ),
@@ -83,7 +83,7 @@
 
 	if ( is_user_logged_in() ) {
 		// Add "About WordPress" link
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'wp-logo',
 			'id'     => 'about',
 			'title'  => __('About WordPress'),
@@ -92,7 +92,7 @@
 	}
 
 	// Add WordPress.org link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'wporg',
 		'title'     => __('WordPress.org'),
@@ -100,7 +100,7 @@
 	) );
 
 	// Add codex link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'documentation',
 		'title'     => __('Documentation'),
@@ -108,7 +108,7 @@
 	) );
 
 	// Add forums link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'support-forums',
 		'title'     => __('Support Forums'),
@@ -116,7 +116,7 @@
 	) );
 
 	// Add feedback link
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent'    => 'wp-logo-external',
 		'id'        => 'feedback',
 		'title'     => __('Feedback'),
@@ -141,7 +141,7 @@
 	$howdy  = sprintf( __('Howdy, %1$s'), $current_user->display_name );
 	$class  = empty( $avatar ) ? '' : 'with-avatar';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id'        => 'my-account',
 		'parent'    => 'top-secondary',
 		'title'     => $howdy . $avatar,
@@ -177,7 +177,7 @@
 	if ( $current_user->display_name !== $current_user->user_nicename )
 		$user_info .= "<span class='username'>{$current_user->user_nicename}</span>";
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent' => 'user-actions',
 		'id'     => 'user-info',
 		'title'  => $user_info,
@@ -186,13 +186,13 @@
 			'tabindex' => -1,
 		),
 	) );
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent' => 'user-actions',
 		'id'     => 'edit-profile',
 		'title'  => __( 'Edit My Profile' ),
 		'href' => $profile_url,
 	) );
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent' => 'user-actions',
 		'id'     => 'logout',
 		'title'  => __( 'Log Out' ),
@@ -231,7 +231,7 @@
 	if ( $title != $blogname )
 		$title = trim( $title ) . '&hellip;';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id'    => 'site-name',
 		'title' => $title,
 		'href'  => is_admin() ? home_url( '/' ) : admin_url(),
@@ -241,7 +241,7 @@
 
 	if ( is_admin() ) {
 		// Add an option to visit the site.
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'site-name',
 			'id'     => 'view-site',
 			'title'  => __( 'Visit Site' ),
@@ -251,7 +251,7 @@
 	// We're on the front end, print a copy of the admin menu.
 	} else {
 		// Add the dashboard item.
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'site-name',
 			'id'     => 'dashboard',
 			'title'  => __( 'Dashboard' ),
@@ -279,7 +279,7 @@
 	if ( count( $wp_admin_bar->user->blogs ) < 1 && ! is_super_admin() )
 		return;
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id'    => 'my-sites',
 		'title' => __( 'My Sites' ),
 		'href'  => admin_url( 'my-sites.php' ),
@@ -291,32 +291,32 @@
 			'id'     => 'my-sites-super-admin',
 		) );
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'my-sites-super-admin',
 			'id'     => 'network-admin',
 			'title'  => __('Network Admin'),
 			'href'   => network_admin_url(),
 		) );
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-d',
 			'title'  => __( 'Dashboard' ),
 			'href'   => network_admin_url(),
 		) );
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-s',
 			'title'  => __( 'Sites' ),
 			'href'   => network_admin_url( 'sites.php' ),
 		) );
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-u',
 			'title'  => __( 'Users' ),
 			'href'   => network_admin_url( 'users.php' ),
 		) );
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => 'network-admin',
 			'id'     => 'network-admin-v',
 			'title'  => __( 'Visit Network' ),
@@ -343,14 +343,14 @@
 		$blogname = empty( $blog->blogname ) ? $blog->domain : $blog->blogname;
 		$menu_id  = 'blog-' . $blog->userblog_id;
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent'    => 'my-sites-list',
 			'id'        => $menu_id,
 			'title'     => $blavatar . $blogname,
 			'href'      => get_admin_url( $blog->userblog_id ),
 		) );
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => $menu_id,
 			'id'     => $menu_id . '-d',
 			'title'  => __( 'Dashboard' ),
@@ -358,13 +358,13 @@
 		) );
 
 		if ( current_user_can_for_blog( $blog->userblog_id, 'edit_posts' ) ) {
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_node( array(
 				'parent' => $menu_id,
 				'id'     => $menu_id . '-n',
 				'title'  => __( 'New Post' ),
 				'href'   => get_admin_url( $blog->userblog_id, 'post-new.php' ),
 			) );
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_node( array(
 				'parent' => $menu_id,
 				'id'     => $menu_id . '-c',
 				'title'  => __( 'Manage Comments' ),
@@ -372,7 +372,7 @@
 			) );
 		}
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent' => $menu_id,
 			'id'     => $menu_id . '-v',
 			'title'  => __( 'Visit Site' ),
@@ -395,7 +395,7 @@
 
 	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id' => $id,
 		'title' => __( 'Shortlink' ),
 		'href' => $short,
@@ -420,7 +420,7 @@
 			&& current_user_can( $post_type_object->cap->read_post, $post->ID )
 			&& ( $post_type_object->public ) )
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_node( array(
 				'id' => 'view',
 				'title' => $post_type_object->labels->view_item,
 				'href' => get_permalink( $post->ID )
@@ -430,7 +430,7 @@
 			&& ( $tax = get_taxonomy( $tag->taxonomy ) )
 			&& $tax->public )
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_node( array(
 				'id' => 'view',
 				'title' => $tax->labels->view_item,
 				'href' => get_term_link( $tag )
@@ -447,7 +447,7 @@
 			&& current_user_can( $post_type_object->cap->edit_post, $current_object->ID )
 			&& ( $post_type_object->show_ui || 'attachment' == $current_object->post_type ) )
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_node( array(
 				'id' => 'edit',
 				'title' => $post_type_object->labels->edit_item,
 				'href' => get_edit_post_link( $current_object->ID )
@@ -457,7 +457,7 @@
 			&& current_user_can( $tax->cap->edit_terms )
 			&& $tax->show_ui )
 		{
-			$wp_admin_bar->add_menu( array(
+			$wp_admin_bar->add_node( array(
 				'id' => 'edit',
 				'title' => $tax->labels->edit_item,
 				'href' => get_edit_term_link( $current_object->term_id, $current_object->taxonomy )
@@ -509,7 +509,7 @@
 
 	$title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id'    => 'new-content',
 		'title' => $title,
 		'href'  => admin_url( current( array_keys( $actions ) ) ),
@@ -521,7 +521,7 @@
 	foreach ( $actions as $link => $action ) {
 		list( $title, $id ) = $action;
 
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_node( array(
 			'parent'    => 'new-content',
 			'id'        => $id,
 			'title'     => $title,
@@ -546,7 +546,7 @@
 	$icon  = '<span class="ab-icon"></span>';
 	$title = '<span id="ab-awaiting-mod" class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '">' . number_format_i18n( $awaiting_mod ) . '</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id'    => 'comments',
 		'title' => $icon . $title,
 		'href'  => admin_url('edit-comments.php'),
@@ -560,25 +560,53 @@
  * @since 3.1.0
  */
 function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
+	$wp_admin_bar->add_group( array(
+		'parent' => 'site-name',
+		'id'     => 'appearance',
+	) );
 
 	if ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'themes', 'title' => __('Themes'), 'href' => admin_url('themes.php') ) );
+		$wp_admin_bar->add_node( array(
+			'parent' => 'appearance',
+			'id'     => 'themes',
+			'title'  => __( 'Themes' ),
+			'href'   => admin_url( 'themes.php' ),
+		) );
 
 	if ( ! current_user_can( 'edit_theme_options' ) )
 		return;
 
-	if ( current_theme_supports( 'widgets' )  )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'widgets', 'title' => __('Widgets'), 'href' => admin_url('widgets.php') ) );
+	if ( current_theme_supports( 'widgets' ) )
+		$wp_admin_bar->add_node( array(
+			'parent' => 'appearance',
+			'id'     => 'widgets',
+			'title'  => __( 'Widgets' ),
+			'href'   => admin_url( 'widgets.php' ),
+		) );
 
-	 if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
+		$wp_admin_bar->add_node( array(
+			'parent' => 'appearance',
+			'id'     => 'menus',
+			'title'  => __( 'Menus' ),
+			'href'   => admin_url( 'nav-menus.php' ),
+		) );
 
 	if ( current_theme_supports( 'custom-background' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'background', 'title' => __('Background'), 'href' => admin_url('themes.php?page=custom-background') ) );
+		$wp_admin_bar->add_node( array(
+			'parent' => 'appearance',
+			'id'     => 'background',
+			'title'  => __( 'Background' ),
+			'href'   => admin_url( 'themes.php?page=custom-background' ),
+		) );
 
 	if ( current_theme_supports( 'custom-header' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'header', 'title' => __('Header'), 'href' => admin_url('themes.php?page=custom-header') ) );
+		$wp_admin_bar->add_node( array(
+			'parent' => 'appearance',
+			'id'     => 'header',
+			'title'  => __( 'Header' ),
+			'href'   => admin_url( 'themes.php?page=custom-header' ),
+		) );
 }
 
 /**
@@ -595,7 +623,7 @@
 
 	$title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'id'    => 'updates',
 		'title' => $title,
 		'href'  => network_admin_url( 'update-core.php' ),
@@ -619,7 +647,7 @@
 	$form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
 	$form .= '</form>';
 
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_node( array(
 		'parent' => 'top-secondary',
 		'id'     => 'search',
 		'title'  => $form,