Changeset 6669 for trunk/bp-core/bp-core-actions.php

Timestamp:

12/25/2012 11:47:12 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Move bp_core_load_admin_bar() action from 'bp_loaded' to 'bp_init' action, because it uses the current user's settings. Fixes issue with network wide activation of BuddyPress causing premature 404 issues with bbPress 2.x.

File:

• trunk/bp-core/bp-core-actions.php (modified) (2 diffs)

trunk/bp-core/bp-core-actions.php

@@ -54 +54 @@
 add_action( 'bp_loaded', 'bp_include',                  4  );
 add_action( 'bp_loaded', 'bp_setup_widgets',            6  );
-add_action( 'bp_loaded', 'bp_core_load_admin_bar',      10 );
 add_action( 'bp_loaded', 'bp_register_theme_packages',  12 );
 add_action( 'bp_loaded', 'bp_register_theme_directory', 14 );
@@ -65 +64 @@
  *                                                 v---Load order
  */
-add_action( 'bp_init', 'bp_core_set_uri_globals',  2 );
-add_action( 'bp_init', 'bp_setup_globals',         4 );
-add_action( 'bp_init', 'bp_setup_nav',             6 );
-add_action( 'bp_init', 'bp_setup_title',           8 );
+add_action( 'bp_init', 'bp_core_set_uri_globals',  2  );
+add_action( 'bp_init', 'bp_setup_globals',         4  );
+add_action( 'bp_init', 'bp_setup_nav',             6  );
+add_action( 'bp_init', 'bp_setup_title',           8  );
+add_action( 'bp_init', 'bp_core_load_admin_bar',   10 );
 
 /**