Changeset 6439 for trunk/bp-core/bp-core-template-loader.php

Timestamp:

10/22/2012 07:08:52 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• Move 'bp_add_template_locations' filter from 'bp_get_template_part' to 'bp_locate_template'
• Allows for easier template location across multiple theme configurations.
• Revert part of r6394 in lieu of this method.
• See #3741

File:

• trunk/bp-core/bp-core-template-loader.php (modified) (3 diffs)

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

@@ -67 +67 @@
     $fallback_theme = bp_get_theme_compat_dir();
 
+    // Allow templates to be filtered
+    // BuddyPress core automatically adds bp_add_template_locations()
+    $template_names = apply_filters( 'bp_locate_template', $template_names );
+
     // Try to find a template file
     foreach ( (array) $template_names as $template_name ) {
@@ -88 +92 @@
 
         // Check theme compatibility last
-        } else {
-            // 3rd-party plugin devs can hook into the 'bp_locate_fallback_template'
-            // filter to load custom templates for their component if desired
-            $fallback_template = apply_filters( 'bp_locate_fallback_template', trailingslashit( $fallback_theme ) . $template_name, $template_name );
-
-            if ( file_exists( $fallback_template ) ) {
-                $located = $fallback_template;
-                break;
-            }
+        } elseif ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
+            $located = trailingslashit( $fallback_theme ) . $template_name;
+            break;
         }
     }
@@ -204 +202 @@
 
     // Loop through locations and templates and combine
-    foreach ( $locations as $location )
-        foreach ( $templates as $template )
-            $retval[] = trailingslashit( $location ) . $template;
+    foreach ( (array) $locations as $location )
+        foreach ( (array) $templates as $template )
+            $retval[] = ltrim( trailingslashit( $location ) . $template, '/' );
 
     return apply_filters( 'bp_add_template_locations', $retval, $templates );