Changeset 6329

Timestamp:

09/11/2012 06:45:56 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Theme Compat:

• Use theme directory functions instead of constants in bp_locate_template().

File:

• trunk/bp-core/bp-core-template-loader.php (modified) (1 diff)

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

@@ -73 +73 @@
         // 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
-        if ( file_exists( trailingslashit( STYLESHEETPATH ) . $template_name ) ) {
-            $located = trailingslashit( STYLESHEETPATH ) . $template_name;
+        if ( file_exists( trailingslashit( $child_theme ) . $template_name ) ) {
+            $located = trailingslashit( $child_theme ) . $template_name;
             break;
 
         // Check parent theme next
-        } elseif ( file_exists( trailingslashit( TEMPLATEPATH ) . $template_name ) ) {
-            $located = trailingslashit( TEMPLATEPATH ) . $template_name;
+        } elseif ( file_exists( trailingslashit( $parent_theme ) . $template_name ) ) {
+            $located = trailingslashit( $child_theme ) . $template_name;
             break;
 
         // Check theme compatibility last
-        } elseif ( file_exists( trailingslashit( bp_get_theme_compat_dir() ) . $template_name ) ) {
-            $located = trailingslashit( bp_get_theme_compat_dir() ) . $template_name;
+        } elseif ( file_exists( trailingslashit( $fallback_theme ) . $template_name ) ) {
+            $located = trailingslashit( $fallback_theme ) . $template_name;
             break;
         }