Ticket #18880: 18880.diff

wp-includes/admin-bar.php

@@ -111 +111 @@
         $wp_admin_bar->add_menu( array(
                 'parent' => 'wp-logo',
                 'id'     => 'wp-logo-secondary',
-                'title'  => __( ' ' ),
+                'title'  => ' ',
                 'meta'   => array(
                         'class' => 'secondary',
                 ),
@@ -759 +759 @@
         return 'true' === $pref;
 }
 
+/**
+ * Provide backwards compatibility for the admin_user_info_links filter.
+ *
+ * I haz a sad.
+ *
+ * @access private
+ * @since 3.3.0
+ */
+function _wp_admin_bar_profile_links_compat( $wp_admin_bar = null ) {
+        if ( 'in_admin_header' == current_filter() ) {
+                if ( has_filter( 'admin_user_info_links' ) )
+                        add_action( 'admin_bar_menu', '_wp_admin_bar_profile_links_compat' );
+                return;
+        }
+
+        $original_howdy = sprintf( __( 'Howdy, %1$s' ), $GLOBALS['user_identity'] );
+        $links = array(
+                5 => $original_howdy,
+                8 => null,
+                10 => null,
+                15 => null,
+        );
+        
+        $links = apply_filters( 'admin_user_info_links', $links, wp_get_current_user() );
+        ksort( $links );
+
+        $filtered_howdy = array_shift( $links );
+
+        // Srsly?
+        if ( $filtered_howdy != $original_howdy )
+                $wp_admin_bar->menu->{'my-account'}['title'] = $filtered_howdy . get_avatar( get_current_user_id(), 28 );
+
+        $links = array_filter( $links );
+
+        if ( empty( $links ) )
+                return;
+
+        // Trim whitespace and pipes from links.
+        $links = array_map( 'trim', $links, array_fill( 0, count( $links ), " |\n\t" ) );
+
+        foreach ( $links as $link ) {
+                if ( ! preg_match( '#<a\s[^>]*?href=[\'"](.+?)[\'"].*?>(.*?)</a>#is', $link, $matches ) )
+                        continue;
+                $wp_admin_bar->add_menu( array(
+                        'parent' => 'my-account',
+                        'title' => $matches[2],
+                        'href' => $matches[1],
+                ) );
+        }
+}
+if ( is_admin() )
+        add_action( 'in_admin_header', '_wp_admin_bar_profile_links_compat' );
+else
+        add_action( 'admin_bar_menu', '_wp_admin_bar_profile_links_compat' );
+
 ?>

wp-includes/css/admin-bar.dev.css

@@ -131 +131 @@
 }
 
 #wpadminbar .quicklinks .menupop ul li a,
+#wpadminbar .quicklinks .menupop.hover ul li a {
+        min-width: 140px;
+}
+#wpadminbar .quicklinks .menupop ul li a,
+#wpadminbar .quicklinks .menupop.hover ul li a,
 #wpadminbar .quicklinks .menupop ul li a span,
 #wpadminbar .quicklinks .menupop ul li a strong,
-#wpadminbar .quicklinks .menupop.hover ul li a,
 #wpadminbar .quicklinks .menupop.hover ul li a span,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a span,
@@ -143 +147 @@
         color: #21759B;
         text-shadow: none;
         white-space: nowrap;
-        min-width: 140px;
 }
 
 #wpadminbar .shortlink-input {