Ticket #17970: 17970.2.patch

wp-admin/css/wp-admin-rtl.dev.css

@@ -332 +332 @@
 #user_info_links_wrap {
         right: auto;
         left: 0;
+        margin: 0 -7px 0 -3px;
 }
 
 #wphead {

wp-admin/css/wp-admin.dev.css

@@ -1401 +1401 @@
 
 #user_info_links_wrap {
         min-width: 100px;
-        width: 100%;
         top: 25px;
         right: 0;
         padding: 0;
+        margin: 0 -3px 0 -7px;
         text-shadow: rgba(255,255,255,0.7) 0 1px 0;
 }
 
 #user_info_links {
-        position: absolute;
-        left: -1px;
-        right: -1px;
         overflow: hidden;
         margin-bottom: 0;
 }

wp-includes/admin-bar.php

@@ -112 +112 @@
 }
 
 /**
+ * Add "Network Admin"/"Site Admin" link for Multisite.
+ *
+ * @since 3.3.0
+ */
+function wp_admin_bar_network_admin_menu( $wp_admin_bar ) {
+        $user_id = get_current_user_id();
+
+        if ( 0 != $user_id && is_multisite() && is_admin() && is_super_admin() ) {
+                if ( ! is_network_admin() )
+                        $wp_admin_bar->add_menu( array( 'id' => 'network-admin', 'title' => esc_attr__('Network Admin'), 'href' => network_admin_url() ) );
+                else
+                        $wp_admin_bar->add_menu( array( 'id' => 'site-admin', 'title' => esc_attr__('Site Admin'), 'href' => get_dashboard_url( $user_id ) ) );
+        }
+}
+
+/**
  * Add the "My Sites/[Site Name]" menu and all submenus.
  *
  * @since 3.1.0

wp-includes/class-wp-admin-bar.php

@@ -183 +183 @@
         function add_menus() {
                 add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 );
                 add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
+                add_action( 'admin_bar_menu', 'wp_admin_bar_network_admin_menu', 23 );
                 add_action( 'admin_bar_menu', 'wp_admin_bar_dashboard_view_site_menu', 25 );
                 add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 30 );
                 add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 );