Ticket #3419: 3419.01.patch

bp-core/bp-core-buddybar.php

@@ -348 +348 @@
         }
 
         unset( $bp->bp_nav[$parent_id] );
+        
+        if ( bp_use_wp_admin_bar() ) {
+                $bp->remove_from_admin_bar[$parent_id]['self'] = true;
+        }
 }
 
+function bp_core_remove_nav_item_from_admin_bar_helper() {
+        global $bp, $wp_admin_bar;
+        
+        if ( !empty( $bp->remove_from_admin_bar ) ) {
+                foreach( (array)$bp->remove_from_admin_bar as $slug => $item ) {
+                        foreach( (array)$item as $key => $nav_item ) {
+                                if ( 'self' == $key ) {
+                                        $wp_admin_bar->remove_menu( 'my-account-' . $slug );
+                                } else {
+                                        $wp_admin_bar->remove_menu( 'my-account-' . $slug . '-' . $nav_item );
+                                }
+                        }
+                }
+        }
+}
+add_action( 'wp_before_admin_bar_render', 'bp_core_remove_nav_item_from_admin_bar_helper' );
+
 /**
  * Removes a navigation item from the sub navigation array used in BuddyPress themes.
  *
@@ -373 +394 @@
 
         if ( isset( $bp->bp_options_nav[$parent_id] ) && !count( $bp->bp_options_nav[$parent_id] ) )
                 unset($bp->bp_options_nav[$parent_id]);
+        
+        if ( bp_use_wp_admin_bar() ) {
+                $bp->remove_from_admin_bar[$parent_id][$slug] = $slug;
+        }
 }
 
 /**