Changeset 8497 for trunk/wp-includes/general-template.php

Timestamp:

07/30/2008 06:21:14 AM (17 years ago)

Author:

westi

Message:

Look for template files in the stylesheet folder as well as the template folder for inheriting themes. Fixes #7086 props ionfish.

File:

• trunk/wp-includes/general-template.php (modified) (3 diffs)

trunk/wp-includes/general-template.php

@@ -5 +5 @@
 function get_header() {
     do_action( 'get_header' );
-    if ( file_exists( TEMPLATEPATH . '/header.php') )
+    if ( file_exists( STYLESHEETPATH . '/header.php') )
+        load_template( STYLESHEETPATH . '/header.php');
+    elseif ( file_exists( TEMPLATEPATH . '/header.php') )
         load_template( TEMPLATEPATH . '/header.php');
     else
@@ -14 +16 @@
 function get_footer() {
     do_action( 'get_footer' );
-    if ( file_exists( TEMPLATEPATH . '/footer.php') )
+    if ( file_exists( STYLESHEETPATH . '/footer.php') )
+        load_template( STYLESHEETPATH . '/footer.php');
+    elseif ( file_exists( TEMPLATEPATH . '/footer.php') )
         load_template( TEMPLATEPATH . '/footer.php');
     else
@@ -23 +27 @@
 function get_sidebar( $name = null ) {
     do_action( 'get_sidebar' );
-    if ( isset($name) && file_exists( TEMPLATEPATH . "/sidebar-{$name}.php") )
+    if ( isset($name) && file_exists( STYLESHEETPATH . "/sidebar-{$name}.php") )
+        load_template( STYLESHEETPATH . "/sidebar-{$name}.php");
+    elseif ( isset($name) && file_exists( TEMPLATEPATH . "/sidebar-{$name}.php") )
         load_template( TEMPLATEPATH . "/sidebar-{$name}.php");
+    elseif ( file_exists( STYLESHEETPATH . '/sidebar.php') )
+        load_template( STYLESHEETPATH . '/sidebar.php');
     elseif ( file_exists( TEMPLATEPATH . '/sidebar.php') )
         load_template( TEMPLATEPATH . '/sidebar.php');