Changeset 6780

Timestamp:

02/10/2013 11:57:50 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Compatibility:

• When locating template files, filter 'bbp_get_template_stack' rather than 'bbp_get_template_part'
• Fixes bug where using bbp_locate_template() directly would result in missing subdirectory locations.
• Props r-a-y.
• Fixes #4755.

Location:

trunk/bp-core

Files:

• bp-core-filters.php (modified) (1 diff)
• bp-core-template-loader.php (modified) (1 diff)

trunk/bp-core/bp-core-filters.php

@@ -59 +59 @@
  * bp_template_include() works and do something similar. :)
  */
-add_filter( 'bp_template_include', 'bp_template_include_theme_supports', 2, 1 );
-add_filter( 'bp_template_include', 'bp_template_include_theme_compat',   4, 2 );
-
-// Run all template parts through additional template locations
-add_filter( 'bp_locate_template',   'bp_add_template_locations' );
-add_filter( 'bp_get_template_part', 'bp_add_template_locations' );
+add_filter( 'bp_template_include',   'bp_template_include_theme_supports', 2, 1 );
+add_filter( 'bp_template_include',   'bp_template_include_theme_compat',   4, 2 );
+
+// Filter BuddyPress template locations
+add_filter( 'bp_get_template_stack', 'bp_add_template_locations'                );
 
 // Turn comments off for BuddyPress pages

trunk/bp-core/bp-core-template-loader.php

@@ -279 +279 @@
  * @since BuddyPress (1.7)
  *
- * @param array $templates
+ * @param array $stacks
  * @return array()
  */
-function bp_add_template_locations( $templates = array() ) {
+function bp_add_template_stack_locations( $stacks = array() ) {
     $retval = array();
 
     // Get alternate locations
-    $locations = bp_get_template_locations( $templates );
-
-    // Loop through locations and templates and combine
-    foreach ( (array) $locations as $location )
-        foreach ( (array) $templates as $template )
-            $retval[] = ltrim( trailingslashit( $location ) . $template, '/' );
-
-    return apply_filters( 'bp_add_template_locations', array_unique( $retval ), $templates );
+    $locations = bp_get_template_locations();
+
+    // Loop through locations and stacks and combine
+    foreach ( (array) $stacks as $stack )
+        foreach ( (array) $locations as $custom_location )
+            $retval[] = untrailingslashit( trailingslashit( $stack ) . $custom_location );
+
+    return apply_filters( 'bp_add_template_stack_locations', array_unique( $locations ), $stacks );
 }