Changeset 6490

Timestamp:

11/06/2012 07:10:45 PM (14 years ago)

Author:

r-a-y

Message:

Theme Compat:

• In bp_locate_template(), make sure templates placed in custom template

locations (as set in bp_add_template_locations()) are recognized.

• Previously, the fallback template would stop the foreach loop from

checking the next available template because the fallback template will
always exist.

• Now, the fallback template is moved out of the foreach loop and into a

separate one so all template locations are checked.

• See #3741.

File:

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

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

@@ -72 +72 @@
 
         // Try to find a template file
+        // Check the parent and child theme directories first
         foreach ( (array) $template_names as $template_name ) {
 
@@ -90 +91 @@
                         $located = trailingslashit( $parent_theme ) . $template_name;
                         break;
-
-                // Check theme compatibility last
-                } elseif ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
-                        $located = trailingslashit( $fallback_theme ) . $template_name;
-                        break;
+                }
+        }
+
+        // Check theme compatibility last if no template is found in the current theme
+        if ( empty( $located ) ) {
+                foreach ( (array) $template_names as $template_name ) {
+                        if ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
+                                $located = trailingslashit( $fallback_theme ) . $template_name;
+                                break;
+                        }
                 }
         }