Changeset 19398

Timestamp:

11/22/11 16:19:05 (3 years ago)

Author:

ryan

Message:

Don't show Add New and Comments admin bar menus in network or user admins. Add tooltip to comments menu. Props ocean90. fixes #19327

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (1 diff)
• class-wp-admin-bar.php (modified) (1 diff)

trunk/wp-includes/admin-bar.php

@@ -517 +517 @@
     $awaiting_mod = wp_count_comments();
     $awaiting_mod = $awaiting_mod->moderated;
-
-    $icon  = "<div class='ab-comments-icon'>";
+    $awaiting_title = sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) );
+
+    $icon  = "<div class='ab-comments-icon' title='$awaiting_title'>";
     $icon .= "<div class='ab-comments-icon-body'></div>";
     $icon .= "<div class='ab-comments-icon-arrow'></div>";

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

@@ -260 +260 @@
 
         // Content related.
-        add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
-        add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
+        if ( ! is_network_admin() && ! is_user_admin() ) {
+            add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
+            add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 70 );
+        }
         add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 80 );
         add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 );