Changeset 5870

Timestamp:

02/29/2012 11:14:12 PM (13 years ago)

Author:

boonebgorges

Message:

Move bp_redirect_canonical to bp_template_redirect, for greater consistency with WP template loading and canonical redirects.
Fixes #4031.
Also changes the priority of some actions that are currently hooked to bp_template_redirect, to ensure that they are fired after bp_redirect_canonical().

Location:

trunk/bp-core

Files:

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

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

@@ -75 +75 @@
  * Attach various template actions to the bp_template_redirect action.
  * The load order helps to execute code at the correct time.
- * 
+ *
  * 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 );
+ *                                                       v---Load order
+ */
+add_action( 'bp_template_redirect', 'bp_redirect_canonical', 2 );
+add_action( 'bp_template_redirect', 'bp_actions',        4 );
+add_action( 'bp_template_redirect', 'bp_screens',        6 );
 
 // Load the admin
@@ -204 +205 @@
  *
  * @since BuddyPress (1.6)
- * 
+ *
  * @uses do_action() Calls 'bp_head' hook
  */
@@ -215 +216 @@
  *
  * @since BuddyPress (1.6)
- * 
+ *
  * @uses do_action() Calls 'bp_footer' hook
  */

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

@@ -587 +587 @@
     }
 }
-add_action( 'bp_core_pre_load_template', 'bp_redirect_canonical' );
 
 /**