Changeset 2656

Timestamp:

02/10/2010 09:13:14 PM (15 years ago)

Author:

apeatling

Message:

Moving BuddyPress registration functions to their own actions. Props jjj

Location:

trunk

Files:

• bp-activity.php (modified) (4 diffs)
• bp-blogs.php (modified) (5 diffs)
• bp-core.php (modified) (3 diffs)
• bp-core/bp-core-widgets.php (modified) (1 diff)
• bp-forums.php (modified) (4 diffs)
• bp-friends.php (modified) (3 diffs)
• bp-groups.php (modified) (5 diffs)
• bp-groups/bp-groups-widgets.php (modified) (1 diff)
• bp-messages.php (modified) (3 diffs)
• bp-xprofile.php (modified) (4 diffs)

trunk/bp-activity.php

@@ -84 +84 @@
     do_action( 'bp_activity_setup_globals' );
 }
-add_action( 'plugins_loaded', 'bp_activity_setup_globals', 5 );
+add_action( 'bp_setup_globals', 'bp_activity_setup_globals' );
 add_action( 'admin_menu', 'bp_activity_setup_globals', 2 );
 
@@ -99 +99 @@
     bp_core_add_root_component( BP_ACTIVITY_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 2 );
+add_action( 'bp_setup_root_components', 'bp_activity_setup_root_component' );
 
 function bp_activity_setup_nav() {
@@ -134 +134 @@
     do_action( 'bp_activity_setup_nav' );
 }
-add_action( 'plugins_loaded', 'bp_activity_setup_nav' );
+add_action( 'bp_setup_nav', 'bp_activity_setup_nav' );
 add_action( 'admin_menu', 'bp_activity_setup_nav' );
 
@@ -1092 +1092 @@
 add_action( 'make_spam_user', 'bp_activity_remove_data' );
 
+
+/********************************************************************************
+ * Custom Actions
+ *
+ * Functions to set up custom BuddyPress actions that all other components can
+ * hook in to.
+ */
+
+/* Allow core components and dependent plugins to register activity actions */
+function bp_register_activity_actions() {
+    do_action( 'bp_register_activity_actions' );
+}
+add_action( 'plugins_loaded', 'bp_register_activity_actions' );
+
+
 ?>

trunk/bp-blogs.php

@@ -101 +101 @@
     do_action( 'bp_blogs_setup_globals' );
 }
-add_action( 'plugins_loaded', 'bp_blogs_setup_globals', 5 );
+add_action( 'bp_setup_globals', 'bp_blogs_setup_globals' );
 add_action( 'admin_menu', 'bp_blogs_setup_globals', 2 );
 
@@ -108 +108 @@
     bp_core_add_root_component( BP_BLOGS_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_blogs_setup_root_component', 2 );
+add_action( 'bp_setup_root_components', 'bp_blogs_setup_root_component' );
 
 /**
@@ -152 +152 @@
     do_action( 'bp_blogs_setup_nav' );
 }
-add_action( 'plugins_loaded', 'bp_blogs_setup_nav' );
+add_action( 'bp_setup_nav', 'bp_blogs_setup_nav' );
 add_action( 'admin_menu', 'bp_blogs_setup_nav' );
 
@@ -231 +231 @@
     do_action( 'bp_blogs_register_activity_actions' );
 }
-add_action( 'plugins_loaded', 'bp_blogs_register_activity_actions' );
+add_action( 'bp_register_activity_actions', 'bp_blogs_register_activity_actions' );
 
 function bp_blogs_record_activity( $args = '' ) {
@@ -829 +829 @@
 add_action( 'delete_user', 'bp_blogs_remove_data', 1 );
 
+
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
+
 function bp_blogs_clear_blog_object_cache( $blog_id, $user_id ) {
     wp_cache_delete( 'bp_blogs_of_user_' . $user_id, 'bp' );

trunk/bp-core.php

@@ -182 +182 @@
     do_action( 'bp_core_setup_globals' );
 }
-add_action( 'plugins_loaded', 'bp_core_setup_globals', 5 );
+add_action( 'bp_setup_globals', 'bp_core_setup_globals' );
 add_action( '_admin_menu', 'bp_core_setup_globals', 2 ); // must be _admin_menu hook.
 
@@ -378 +378 @@
     }
 }
-add_action( 'plugins_loaded', 'bp_core_setup_nav' );
+add_action( 'bp_setup_nav', 'bp_core_setup_nav' );
 add_action( 'admin_menu', 'bp_core_setup_nav' );
 
@@ -2063 +2063 @@
 add_filter( 'login_redirect', 'bp_core_login_redirect' );
 
+
+/********************************************************************************
+ * Custom Actions
+ *
+ * Functions to set up custom BuddyPress actions that all other components can
+ * hook in to.
+ */
+
+/* Allow core components and dependent plugins to set globals */
+function bp_setup_globals() {
+    do_action( 'bp_setup_globals' );
+}
+add_action( 'plugins_loaded', 'bp_setup_globals', 5 );
+
+/* Allow core components and dependent plugins to set root components */
+function bp_setup_root_components() {
+    do_action( 'bp_setup_root_components' );
+}
+add_action( 'plugins_loaded', 'bp_setup_root_components', 2 );
+
+/* Allow core components and dependent plugins to set their nav */
+function bp_setup_nav() {
+    do_action( 'bp_setup_nav' );
+}
+add_action( 'plugins_loaded', 'bp_setup_nav' );
+
+
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
+
 /**
  * bp_core_clear_user_object_cache()

trunk/bp-core/bp-core-widgets.php

@@ -8 +8 @@
     add_action('widgets_init', create_function('', 'return register_widget("BP_Core_Recently_Active_Widget");') );
 }
-add_action( 'plugins_loaded', 'bp_core_register_widgets' );
+add_action( 'bp_register_widgets', 'bp_core_register_widgets' );
 
 /*** WELCOME WIDGET *****************/

trunk/bp-forums.php

@@ -29 +29 @@
     do_action( 'bp_forums_setup' );
 }
-add_action( 'plugins_loaded', 'bp_forums_setup', 5 );
+add_action( 'bp_setup_globals', 'bp_forums_setup' );
 add_action( 'admin_head', 'bp_forums_setup', 2 );
 
@@ -45 +45 @@
     bp_core_add_root_component( BP_FORUMS_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_forums_setup_root_component', 2 );
+add_action( 'bp_setup_root_components', 'bp_forums_setup_root_component' );
 
 function bp_forums_directory_forums_setup() {
@@ -499 +499 @@
 }
 
-// List actions to clear super cached pages on, if super cache is installed
-add_action( 'bp_forums_new_forum', 'bp_core_clear_cache' );
-add_action( 'bp_forums_new_topic', 'bp_core_clear_cache' );
-add_action( 'bp_forums_new_post', 'bp_core_clear_cache' );
 
 function bp_forums_filter_caps( $allcaps ) {
@@ -536 +532 @@
 add_action( 'init', 'bp_forums_filter_template_paths' );
 
+
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
+
+// List actions to clear super cached pages on, if super cache is installed
+add_action( 'bp_forums_new_forum', 'bp_core_clear_cache' );
+add_action( 'bp_forums_new_topic', 'bp_core_clear_cache' );
+add_action( 'bp_forums_new_post', 'bp_core_clear_cache' );
+
 ?>

trunk/bp-friends.php

@@ -48 +48 @@
     do_action( 'friends_setup_globals' );
 }
-add_action( 'plugins_loaded', 'friends_setup_globals', 5 );
+add_action( 'bp_setup_globals', 'friends_setup_globals' );
 add_action( 'admin_menu', 'friends_setup_globals', 2 );
 
@@ -303 +303 @@
     do_action( 'friends_register_activity_actions' );
 }
-add_action( 'plugins_loaded', 'friends_register_activity_actions' );
+add_action( 'bp_register_activity_actions', 'friends_register_activity_actions' );
 
 function friends_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
@@ -626 +626 @@
 add_action( 'make_spam_user', 'friends_remove_data', 1 );
 
+
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
+
 function friends_clear_friend_object_cache( $friendship_id ) {
     if ( !$friendship = new BP_Friends_Friendship( $friendship_id ) )

trunk/bp-groups.php

@@ -97 +97 @@
     do_action( 'groups_setup_globals' );
 }
-add_action( 'plugins_loaded', 'groups_setup_globals', 5 );
+add_action( 'bp_setup_globals', 'groups_setup_globals' );
 add_action( 'admin_menu', 'groups_setup_globals', 2 );
 
@@ -104 +104 @@
     bp_core_add_root_component( BP_GROUPS_SLUG );
 }
-add_action( 'plugins_loaded', 'groups_setup_root_component', 2 );
+add_action( 'bp_setup_root_components', 'groups_setup_root_component' );
 
 function groups_check_installed() {
@@ -217 +217 @@
     do_action( 'groups_setup_nav', $bp->groups->current_group->user_has_access );
 }
-add_action( 'plugins_loaded', 'groups_setup_nav' );
+add_action( 'bp_setup_nav', 'groups_setup_nav' );
 add_action( 'admin_menu', 'groups_setup_nav' );
 
@@ -1267 +1267 @@
     do_action( 'groups_register_activity_actions' );
 }
-add_action( 'plugins_loaded', 'groups_register_activity_actions' );
+add_action( 'bp_register_activity_actions', 'groups_register_activity_actions' );
 
 function groups_record_activity( $args = '' ) {
@@ -2555 +2555 @@
 add_action( 'delete_user', 'groups_remove_data_for_user', 1 );
 add_action( 'make_spam_user', 'groups_remove_data_for_user', 1 );
+
+
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
 
 function groups_clear_group_object_cache( $group_id ) {

trunk/bp-groups/bp-groups-widgets.php

@@ -5 +5 @@
     add_action('widgets_init', create_function('', 'return register_widget("BP_Groups_Widget");') );
 }
-add_action( 'plugins_loaded', 'groups_register_widgets' );
+add_action( 'bp_register_widgets', 'groups_register_widgets' );
 
 /*** GROUPS WIDGET *****************/

trunk/bp-messages.php

@@ -83 +83 @@
     do_action( 'messages_setup_globals' );
 }
-add_action( 'plugins_loaded', 'messages_setup_globals', 5 );
+add_action( 'bp_setup_globals', 'messages_setup_globals' );
 add_action( 'admin_menu', 'messages_setup_globals', 2 );
 
@@ -130 +130 @@
     do_action( 'messages_setup_nav' );
 }
-add_action( 'plugins_loaded', 'messages_setup_nav' );
+add_action( 'bp_setup_nav', 'messages_setup_nav' );
 add_action( 'admin_menu', 'messages_setup_nav' );
 
@@ -592 +592 @@
 
 
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
+
 // List actions to clear super cached pages on, if super cache is installed
 add_action( 'messages_delete_thread', 'bp_core_clear_cache' );

trunk/bp-xprofile.php

@@ -125 +125 @@
     do_action( 'xprofile_setup_globals' );
 }
-add_action( 'plugins_loaded', 'xprofile_setup_globals', 5 );
+add_action( 'bp_setup_globals', 'xprofile_setup_globals' );
 add_action( 'admin_menu', 'xprofile_setup_globals', 2 );
 
@@ -195 +195 @@
     do_action( 'xprofile_setup_nav' );
 }
-add_action( 'plugins_loaded', 'xprofile_setup_nav' );
+add_action( 'bp_setup_nav', 'xprofile_setup_nav' );
 add_action( 'admin_menu', 'xprofile_setup_nav' );
 
@@ -465 +465 @@
     do_action( 'xprofile_register_activity_actions' );
 }
-add_action( 'plugins_loaded', 'xprofile_register_activity_actions' );
+add_action( 'bp_register_activity_actions', 'xprofile_register_activity_actions' );
 
 /**
@@ -952 +952 @@
 add_action( 'delete_user', 'xprofile_remove_data', 1 );
 
+
+/********************************************************************************
+ * Caching
+ *
+ * Caching functions handle the clearing of cached objects and pages on specific
+ * actions throughout BuddyPress.
+ */
+
 function xprofile_clear_profile_groups_object_cache( $group_obj ) {
     wp_cache_delete( 'xprofile_groups', 'bp' );