Changeset 4762 for trunk/includes/core/template-functions.php

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.

File:

• trunk/includes/core/template-functions.php (modified) (1 diff)

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 );
 }