Ticket #3625: 3625.02.patch

bp-activity/bp-activity-actions.php

@@ -22 +22 @@
 function bp_register_activity_actions() {
         do_action( 'bp_register_activity_actions' );
 }
-add_action( 'bp_init', 'bp_register_activity_actions', 8 );
+add_action( 'bp_init_core', 'bp_register_activity_actions', 8 );
 
 /**
  * Allow core components and dependent plugins to register activity actions

bp-core/bp-core-adminbar.php

@@ -43 +43 @@
 
         remove_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 );
 }
-add_action( 'bp_init', 'bp_admin_bar_remove_wp_menus', 2 );
+add_action( 'bp_init_core', 'bp_admin_bar_remove_wp_menus', 2 );
 
 /**
  * Add a menu for the root site of this BuddyPress network
@@ -247 +247 @@
 
         wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_admin_bar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), '20110723' );
 }
-add_action( 'bp_init', 'bp_core_load_admin_bar_css' );
+add_action( 'bp_init_core', 'bp_core_load_admin_bar_css' );
 ?>
+ No newline at end of file

bp-core/bp-core-avatars.php

@@ -43 +43 @@
         if ( !defined( 'BP_AVATAR_DEFAULT_THUMB' ) )
                 define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . '/bp-core/images/mystery-man-50.jpg' );
 }
-add_action( 'bp_init', 'bp_core_set_avatar_constants', 3 );
+add_action( 'bp_init_core', 'bp_core_set_avatar_constants', 3 );
 
 function bp_core_set_avatar_globals() {
         global $bp;

bp-core/bp-core-buddybar.php

@@ -623 +623 @@
 
         wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), '20110723' );
 }
-add_action( 'bp_init', 'bp_core_load_buddybar_css' );
+add_action( 'bp_init_core', 'bp_core_load_buddybar_css' );
 ?>
+ No newline at end of file

bp-core/bp-core-functions.php

@@ -225 +225 @@
 
         require ( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-admin.php' );
 }
-add_action( 'bp_init', 'bp_core_admin_menu_init' );
+add_action( 'bp_init_core', 'bp_core_admin_menu_init' );
 
 /**
  * Adds the "BuddyPress" admin submenu item to the Site Admin tab.
@@ -867 +867 @@
 
         bp_core_redirect( apply_filters( 'bp_core_search_site', home_url( $slug . $query_string . urlencode( $search_terms ) ), $search_terms ) );
 }
-add_action( 'bp_init', 'bp_core_action_search_site', 7 );
+add_action( 'bp_init_core', 'bp_core_action_search_site', 7 );
 
 /**
  * Prints the generation time in the footer of the site.
@@ -901 +901 @@
         else
                 return false;
 }
-add_action ( 'bp_init', 'bp_core_load_buddypress_textdomain', 2 );
+add_action ( 'bp_init_core', 'bp_core_load_buddypress_textdomain', 2 );
 
 function bp_core_add_ajax_hook() {
         // Theme only, we already have the wp_ajax_ hook firing in wp-admin
         if ( !defined( 'WP_ADMIN' ) && isset( $_REQUEST['action'] ) )
                 do_action( 'wp_ajax_' . $_REQUEST['action'] );
 }
-add_action( 'bp_init', 'bp_core_add_ajax_hook' );
+add_action( 'bp_init_ajax', 'bp_core_add_ajax_hook' );
 
 /**
  * Initializes {@link BP_Embed} after everything is loaded.
@@ -923 +923 @@
         if ( empty( $bp->embed ) )
                 $bp->embed = new BP_Embed();
 }
-add_action( 'bp_init', 'bp_embed_init', 9 );
+add_action( 'bp_init_core', 'bp_embed_init', 9 );
 
 /**
  * When switching from single to multisite we need to copy blog options to

bp-core/bp-core-hooks.php

@@ -4 +4 @@
 
 /** Loaded ********************************************************************/
 
-add_action( 'plugins_loaded', 'bp_loaded',  10 );
+add_action( 'plugins_loaded', 'bp_loaded',  8 );
 
-add_action( 'bp_loaded',      'bp_include', 2  );
+add_action( 'bp_loaded',      'bp_include', 2 );
 
-add_action( 'wp',             'bp_actions', 3  );
+add_action( 'wp',             'bp_actions', 3 );
 
-add_action( 'wp',             'bp_screens', 4  );
+add_action( 'wp',             'bp_screens', 4 );
 
 /** Init **********************************************************************/
 
 // Attach bp_init to WordPress init
-add_action( 'init',       'bp_init'                    );
+add_action( 'init',            'bp_init'                  8 );
 
 // Parse the URI and set globals
-add_action( 'bp_init',    'bp_core_set_uri_globals', 2 );
+add_action( 'bp_init_core',    'bp_core_set_uri_globals', 2 );
 
 // Setup component globals
-add_action( 'bp_init',    'bp_setup_globals',        4 );
+add_action( 'bp_init_core',    'bp_setup_globals',        4 );
 
 // Setup the navigation menu
-add_action( 'bp_init',    'bp_setup_nav',            7 );
+add_action( 'bp_init_core',    'bp_setup_nav',            7 );
 
 // Setup the navigation menu
-add_action( 'admin_bar_menu',    'bp_setup_admin_bar'  );
+add_action( 'admin_bar_menu',  'bp_setup_admin_bar'         );
 
 // Setup the title
-add_action( 'bp_init',    'bp_setup_title',          9 );
+add_action( 'bp_init_core',    'bp_setup_title',          9 );
 
 // Setup widgets
-add_action( 'bp_loaded',  'bp_setup_widgets'           );
+add_action( 'bp_loaded',       'bp_setup_widgets'           );
 
 // Setup admin bar
-add_action( 'bp_loaded',  'bp_core_load_admin_bar'     );
+add_action( 'bp_loaded',       'bp_core_load_admin_bar'     );
 
 /** The hooks *****************************************************************/
 
@@ -84 +84 @@
 }
 
 /**
- * Initlialize code
+ * Initialize code
  */
 function bp_init() {
+        do_action( 'bp_init_core' );
         do_action( 'bp_init' );
+        do_action( 'bp_init_ajax' );
 }
 
 /**

bp-friends/bp-friends-actions.php

@@ -41 +41 @@
 
         return false;
 }
-add_action( 'bp_init', 'friends_action_add_friend' );
+add_action( 'bp_init_core', 'friends_action_add_friend' );
 
 function friends_action_remove_friend() {
         if ( !bp_is_friends_component() || !bp_is_current_action( 'remove-friend' ) )
@@ -76 +76 @@
 
         return false;
 }
-add_action( 'bp_init', 'friends_action_remove_friend' );
+add_action( 'bp_init_core', 'friends_action_remove_friend' );
 
 ?>
+ No newline at end of file

bp-groups/bp-groups-classes.php

@@ -1286 +1286 @@
                 return false;
 
         /* Register the group extension on the bp_init action so we have access to all plugins */
-        add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "bp_actions", array( &$extension, "_register" ), 8 );' ), 11 );
+        add_action( 'bp_init_core', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "bp_actions", array( &$extension, "_register" ), 8 );' ), 11 );
 }
 
 ?>
+ No newline at end of file

bp-members/bp-members-signup.php

@@ -610 +610 @@
         if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
                 bp_core_redirect( bp_get_signup_page() );
 }
-add_action( 'bp_init', 'bp_core_wpsignup_redirect' );
+add_action( 'bp_init_core', 'bp_core_wpsignup_redirect' );
 ?>
+ No newline at end of file