Changeset 5813

Timestamp:

02/21/2012 12:12:13 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Move bp_screens and bp_actions onto bp_template_redirect action, which is hooked to template redirect.

• Moves template redirecting where it belongs, the template_redirect action
• Leaves bp_ready hooked to 'wp' for now, pending testing
• Anything hooked to bp_ready works the way it always did
• Anything properly hooked to bp_actions and bp_screens works normally
• Fully backwards compatible
• Fixes #4029

Location:

trunk/bp-core

Files:

• bp-core-catchuri.php (modified) (1 diff)
• bp-core-hooks.php (modified) (3 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -430 +430 @@
     }
 }
-add_action( 'wp', 'bp_core_catch_no_access' );
+add_action( 'bp_template_redirect', 'bp_core_catch_no_access', 1 );
 
 /**

trunk/bp-core/bp-core-hooks.php

@@ -25 +25 @@
  * updates to WordPress occur.
  */
-add_action( 'plugins_loaded',         'bp_loaded',                 10 );
-add_action( 'init',                   'bp_init',                   10 );
-add_action( 'wp',                     'bp_ready',                  10 );
+add_action( 'plugins_loaded',     'bp_loaded',            10    );
+add_action( 'init',               'bp_init',              10    );
+add_action( 'wp',                 'bp_ready',             10    );
+add_action( 'template_redirect',  'bp_template_redirect', 10    );
+add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts',   10    );
+add_action( 'admin_bar_menu',     'bp_setup_admin_bar',   10    );
+add_action( 'template_redirect',  'bp_template_redirect', 10    );
+add_filter( 'template_include',   'bp_template_include',  10    );
+add_filter( 'after_theme_setup',  'bp_after_theme_setup', 10    );
+add_filter( 'map_meta_cap',       'bp_map_meta_caps',     10, 4 );
+
+// Piggy back WordPress theme actions
+add_action( 'wp_head',   'bp_head',   10 );
+add_action( 'wp_footer', 'bp_footer', 10 );
+
 //add_action( 'generate_rewrite_rules', 'bp_generate_rewrite_rules', 10 );
-//add_action( 'wp_enqueue_scripts',     'bp_enqueue_scripts',        10 );
-//add_filter( 'template_include',       'bp_template_include',       10 );
 
 /**
@@ -57 +67 @@
 
 /**
- * bp_ready - Attached to 'wp' above
- *
- * Attach various initialization actions to the bp_init action.
+ * bp_template_redirect - Attached to 'template_redirect' above
+ *
+ * Attach various template actions to the bp_template_redirect action.
  * The load order helps to execute code at the correct time.
- *                                    v---Load order
- */
-add_action( 'bp_ready', 'bp_actions', 2 );
-add_action( 'bp_ready', 'bp_screens', 4 );
-
-/** Theme *********************************************************************/
-
-// Piggy back WordPress theme actions
-add_action( 'wp_head',   'bp_head'   );
-add_action( 'wp_footer', 'bp_footer' );
-
-/** Admin Bar *****************************************************************/
-
-// Setup the navigation menu
-add_action( 'admin_bar_menu', 'bp_setup_admin_bar', 11 );
-
-/** Roles and Capabilities ****************************************************/
-
-// Map our custom capabilities onto WP's
-add_filter( 'map_meta_cap', 'bp_map_meta_caps', 10, 4 );
+ * 
+ * Note that we currently use template_redirect versus template include because
+ * BuddyPress is a bully and overrides the existing themes output in many
+ * places. This won't always be this way, we promise.
+ *                                                v---Load order
+ */
+add_action( 'bp_template_redirect', 'bp_actions', 2 );
+add_action( 'bp_template_redirect', 'bp_screens', 4 );
 
 /** The hooks *****************************************************************/
@@ -215 +213 @@
 }
 
+/**
+ * Enqueue BuddyPress specific CSS and JS
+ *
+ * @since bbPress (r5812)
+ *
+ * @uses do_action() Calls 'bp_enqueue_scripts'
+ */
+function bp_enqueue_scripts() {
+    do_action ( 'bp_enqueue_scripts' );
+}
+
+/**
+ * Piggy back action for BuddyPress sepecific theme actions once the theme has
+ * been setup and the theme's functions.php has loaded.
+ *
+ * @since bbPress (r5812)
+ *
+ * @uses do_action() Calls 'bp_after_theme_setup'
+ */
+function bp_after_theme_setup() {
+    do_action ( 'bp_after_theme_setup' );
+}
+
+/** Theme Compatibility Filter ************************************************/
+
+/**
+ * The main filter used for theme compatibility and displaying custom BuddyPress
+ * theme files.
+ *
+ * @since BuddyPress (r5812)
+ *
+ * @uses apply_filters()
+ *
+ * @param string $template
+ * @return string Template file to use
+ */
+function bp_template_include( $template = '' ) {
+    return apply_filters( 'bp_template_include', $template );
+}
+
+/** Theme Permissions *********************************************************/
+
+/**
+ * The main action used for redirecting BuddyPress theme actions that are not
+ * permitted by the current_user
+ *
+ * @since BuddyPress (r5812)
+ *
+ * @uses do_action()
+ */
+function bp_template_redirect() {
+    do_action( 'bp_template_redirect' );
+}
+
 ?>