Changeset 4762

Timestamp:

02/10/2013 11:53:07 PM (13 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.

Location:

trunk/includes/core

Files:

• filters.php (modified) (2 diffs)
• template-functions.php (modified) (1 diff)

trunk/includes/core/filters.php

@@ -77 +77 @@
  * bbp_template_include() works and do something similar. :)
  */
-add_filter( 'bbp_template_include', 'bbp_template_include_theme_supports', 2, 1 );
-add_filter( 'bbp_template_include', 'bbp_template_include_theme_compat',   4, 2 );
+add_filter( 'bbp_template_include',   'bbp_template_include_theme_supports', 2, 1 );
+add_filter( 'bbp_template_include',   'bbp_template_include_theme_compat',   4, 2 );
+
+// Filter bbPress template locations
+add_filter( 'bbp_get_template_stack', 'bbp_add_template_stack_locations'          );
 
 // Links
@@ -182 +185 @@
 add_filter( 'bbp_get_reply_author_link',    'bbp_suppress_private_author_link', 10, 2 );
 
-// Filter bbPress template locations
-add_filter( 'bbp_get_template_part',         'bbp_add_template_locations' );
-add_filter( 'bbp_get_profile_template',      'bbp_add_template_locations' );
-add_filter( 'bbp_get_profileedit_template',  'bbp_add_template_locations' );
-add_filter( 'bbp_get_singleview_template',   'bbp_add_template_locations' );
-add_filter( 'bbp_get_forumedit_template',    'bbp_add_template_locations' );
-add_filter( 'bbp_get_topicedit_template',    'bbp_add_template_locations' );
-add_filter( 'bbp_get_topicsplit_template',   'bbp_add_template_locations' );
-add_filter( 'bbp_get_topicmerge_template',   'bbp_add_template_locations' );
-add_filter( 'bbp_get_topictag_template',     'bbp_add_template_locations' );
-add_filter( 'bbp_get_topictagedit_template', 'bbp_add_template_locations' );
-add_filter( 'bbp_get_replymove_template',    'bbp_add_template_locations' );
-
 // Topic and reply author display names
 add_filter( 'bbp_get_topic_author_display_name', 'wptexturize'   );

trunk/includes/core/template-functions.php

@@ -248 +248 @@
  * @return array() 
  */
-function bbp_add_template_locations( $templates = array() ) {
+function bbp_add_template_stack_locations( $stacks = array() ) {
     $retval = array();
 
     // Get alternate locations
-    $locations = bbp_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( 'bbp_add_template_locations', array_unique( $retval ), $templates );
+    $locations = bbp_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( 'bbp_add_template_stack_locations', array_unique( $locations ), $stacks );
 }