Changeset 3105

Timestamp:

06/28/2010 08:40:31 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Adjust load orders for #2325

Location:

branches/1.2

Files:

• bp-activity.php (modified) (1 diff)
• bp-core.php (modified) (3 diffs)
• bp-core/bp-core-avatars.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)

branches/1.2/bp-activity.php

@@ -1193 +1193 @@
     do_action( 'bp_register_activity_actions' );
 }
-add_action( 'bp_init', 'bp_register_activity_actions' );
+add_action( 'bp_loaded', 'bp_register_activity_actions', 8 );
 
 

branches/1.2/bp-core.php

@@ -1954 +1954 @@
         load_textdomain( 'buddypress', $mofile );
 }
-add_action ( 'bp_init', 'bp_core_load_buddypress_textdomain', 2 );
+add_action ( 'bp_loaded', 'bp_core_load_buddypress_textdomain', 2 );
 
 function bp_core_add_ajax_hook() {
@@ -2052 +2052 @@
  * hook in to.
  */
+ 
+/**
+ * bp_include()
+ *
+ * Allow plugins to include their files ahead of core filters
+ */
+function bp_include() {
+    do_action( 'bp_include' );
+}
+add_action( 'bp_loaded', 'bp_include', 2 );
+
+/**
+ * bp_setup_root_components()
+ *
+ * Allow core components and dependent plugins to set root components
+ */
+function bp_setup_root_components() {
+    do_action( 'bp_setup_root_components' );
+}
+add_action( 'bp_loaded', 'bp_setup_root_components', 2 );
+
+/**
+ * bp_setup_globals()
+ *
+ * Allow core components and dependent plugins to set globals
+ */
+function bp_setup_globals() {
+    do_action( 'bp_setup_globals' );
+}
+add_action( 'bp_loaded', 'bp_setup_globals', 6 );
+
+/**
+ * bp_setup_nav()
+ *
+ * Allow core components and dependent plugins to set their nav
+ */
+function bp_setup_nav() {
+    do_action( 'bp_setup_nav' );
+}
+add_action( 'bp_loaded', 'bp_setup_nav', 8 );
+
+/**
+ * bp_setup_widgets()
+ *
+ * Allow core components and dependent plugins to register widgets
+ */
+function bp_setup_widgets() {
+    do_action( 'bp_register_widgets' );
+}
+add_action( 'bp_loaded', 'bp_setup_widgets', 8 );
 
 /**
@@ -2061 +2111 @@
     do_action( 'bp_init' );
 }
-add_action( 'bp_loaded', 'bp_init', 1 );
-
-/**
- * bp_setup_root_components()
- *
- * Allow core components and dependent plugins to set root components
- */
-function bp_setup_root_components() {
-    do_action( 'bp_setup_root_components' );
-}
-add_action( 'bp_loaded', 'bp_setup_root_components', 2 );
-
-/**
- * bp_setup_globals()
- *
- * Allow core components and dependent plugins to set globals
- */
-function bp_setup_globals() {
-    do_action( 'bp_setup_globals' );
-}
-add_action( 'bp_loaded', 'bp_setup_globals', 6 );
-
-/**
- * bp_setup_nav()
- *
- * Allow core components and dependent plugins to set their nav
- */
-function bp_setup_nav() {
-    do_action( 'bp_setup_nav' );
-}
-add_action( 'bp_loaded', 'bp_setup_nav', 10 );
-
-/**
- * bp_setup_widgets()
- *
- * Allow core components and dependent plugins to register widgets
- */
-function bp_setup_widgets() {
-    do_action( 'bp_register_widgets' );
-}
-add_action( 'bp_loaded', 'bp_setup_widgets', 10 );
-
+add_action( 'bp_loaded', 'bp_init' );
 
 /********************************************************************************

branches/1.2/bp-core/bp-core-avatars.php

@@ -45 +45 @@
         define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-core/images/mystery-man-50.jpg' );
 }
-add_action( 'bp_init', 'bp_core_set_avatar_constants' );
+add_action( 'bp_loaded', 'bp_core_set_avatar_constants', 8 );
 
 /**

branches/1.2/bp-loader.php

@@ -62 +62 @@
     do_action( 'bp_loaded' );
 }
-add_action( 'plugins_loaded', 'bp_loaded' );
+add_action( 'plugins_loaded', 'bp_loaded', 20 );
 
 /* Activation Function */