Changeset 4264

Timestamp:

10/22/2012 10:40:31 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• Add 'bbp_add_template_locations' filter to 'bbp_locate_template' filter.
• Add array_unique() to bbp_add_template_locations() to remove possible duplicates.

Location:

trunk/includes/core

Files:

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

trunk/includes/core/filters.php

@@ -170 +170 @@
 
 // Filter bbPress template locations
+add_filter( 'bbp_locate_template',           'bbp_add_template_locations' );
 add_filter( 'bbp_get_template_part',         'bbp_add_template_locations' );
 add_filter( 'bbp_get_profile_template',      'bbp_add_template_locations' );

trunk/includes/core/template-functions.php

@@ -66 +66 @@
     $parent_theme   = get_template_directory();
     $fallback_theme = bbp_get_theme_compat_dir();
+
+    // Allow templates to be filtered
+    // bbPress core automatically adds bbp_add_template_locations()
+    $template_names = apply_filters( 'bbp_locate_template', $template_names );
 
     // Try to find a template file
@@ -164 +168 @@
 
     // Loop through locations and templates and combine
-    foreach ( $locations as $location )
-        foreach ( $templates as $template )
-            $retval[] = trailingslashit( $location ) . $template;
-
-    return apply_filters( 'bbp_add_template_locations', $retval, $templates );
+    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 );
 }