Ticket #3769: 3769.01.patch

bp-core/bp-core-component.php

@@ -218 +218 @@
                 // Setup navigation
                 add_action( 'bp_setup_nav',              array ( $this, 'setup_nav'              ), 10 );
 
-                // Setup WP Admin Bar menus
-                add_action( 'bp_setup_admin_bar',        array ( $this, 'setup_admin_bar'        ), 10 );
-
                 // Setup component title
                 add_action( 'bp_setup_title',            array ( $this, 'setup_title'            ), 10 );
 

bp-friends/bp-friends-loader.php

@@ -84 +84 @@
         }
 
         /**
+         * Setup actions.
+         *
+         * @since 1.6
+         * @global obj $bp
+         */
+        function setup_actions() {
+                parent::setup_actions();
+                add_action( 'bp_setup_admin_bar', array ( $this, 'setup_admin_bar' ), 30 );
+        }
+
+        /**
          * Setup BuddyBar navigation
          *
          * @global obj $bp