Changeset 5680 for trunk/bp-members/bp-members-adminbar.php

Timestamp:

02/09/2012 09:06:00 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Clean up notifications code, and prevent notification for inactive components from appearing. Fixes #3650.

File:

• trunk/bp-members/bp-members-adminbar.php (modified) (5 diffs)

trunk/bp-members/bp-members-adminbar.php

@@ -19 +19 @@
  */
 function bp_members_admin_bar_my_account_menu() {
-        global $bp, $wp_admin_bar, $wp_version;
+        global $bp, $wp_admin_bar;
 
         // Bail if this is an ajax request
@@ -33 +33 @@
                 // Create the main 'My Account' menu
                 $wp_admin_bar->add_menu( array(
-                        //'parent' => 'my-account',
                         'id'     => $bp->my_account_menu_id,
                         'group'  => true,
@@ -146 +145 @@
  */
 function bp_members_admin_bar_notifications_menu() {
-        global $bp, $wp_admin_bar;
+        global $wp_admin_bar;
 
         if ( !is_user_logged_in() )
@@ -152 +151 @@
 
         $notifications = bp_core_get_notifications_for_user( bp_loggedin_user_id(), 'object' );
-        $count         = !empty( $notifications ) ? count( $notifications ) : '0';
+        $count         = !empty( $notifications ) ? count( $notifications ) : 0;
         $alert_class   = (int) $count > 0 ? 'pending-count alert' : 'count no-alert';
         $menu_title    = '<span id="ab-pending-notifications" class="' . $alert_class . '">' . $count . '</span>';
@@ -165 +164 @@
 
         if ( !empty( $notifications ) ) {
-                foreach ( (array)$notifications as $notification ) {
+                foreach ( (array) $notifications as $notification ) {
                         $wp_admin_bar->add_menu( array(
                                 'parent' => 'bp-notifications',