Ticket #1237: patch.diff

bp-friends.php

@@ -89 +89 @@
         
         do_action( 'friends_setup_nav' );
 }
-add_action( 'wp', 'friends_setup_nav', 2 );
-add_action( 'admin_menu', 'friends_setup_nav', 2 );
+add_action( 'plugins_loaded', 'friends_setup_nav' );
+add_action( 'admin_menu', 'friends_setup_nav' );
 
 
 /********************************************************************************

bp-core/bp-core-settings.php

@@ -24 +24 @@
         if ( !is_site_admin() && !(int) get_site_option( 'bp-disable-account-deletion' ) )
                 bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_home() ) );
 }
-add_action( 'wp', 'bp_core_add_settings_nav', 2 );
-add_action( 'admin_menu', 'bp_core_add_settings_nav', 2 );
+add_action( 'plugins_loaded', 'bp_core_add_settings_nav' );
+add_action( 'admin_menu', 'bp_core_add_settings_nav' );
 
 /**** GENERAL SETTINGS ****/