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

Timestamp:

09/29/2012 10:57:49 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Template Locator:

• Move parent/child/fallback out of loop
• Fix parent/child loader issue, where child theme templates still loaded the parent.
• Updates made to bp_locate_template() only.

File:

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

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

@@ -62 +62 @@
 
     // No file found yet
-    $located = false;
+    $located        = false;
+    $child_theme    = get_stylesheet_directory();
+    $parent_theme   = get_template_directory();
+    $fallback_theme = bp_get_theme_compat_dir();
 
     // Try to find a template file
@@ -73 +76 @@
         // Trim off any slashes from the template name
         $template_name = ltrim( $template_name, '/' );
-        $child_theme    = get_stylesheet_directory();
-        $parent_theme   = get_template_directory();
-        $fallback_theme = bp_get_theme_compat_dir();
 
         // Check child theme first
@@ -84 +84 @@
         // Check parent theme next
         } elseif ( file_exists( trailingslashit( $parent_theme ) . $template_name ) ) {
-            $located = trailingslashit( $child_theme ) . $template_name;
+            $located = trailingslashit( $parent_theme ) . $template_name;
             break;