Ticket #18331: 18331.diff

wp-includes/general-template.php

@@ -24 +24 @@
 function get_header( $name = null ) {
         do_action( 'get_header', $name );
 
-        $templates = array();
-        if ( isset($name) )
-                $templates[] = "header-{$name}.php";
-
-        $templates[] = 'header.php';
-
         // Backward compat code will be removed in a future release
-        if ('' == locate_template($templates, true))
-                load_template( ABSPATH . WPINC . '/theme-compat/header.php');
+        if ( '' == get_template_part( 'header', $name ) )
+                load_template( ABSPATH . WPINC . '/theme-compat/header.php' );
 }
 
 /**
@@ -53 +47 @@
 function get_footer( $name = null ) {
         do_action( 'get_footer', $name );
 
-        $templates = array();
-        if ( isset($name) )
-                $templates[] = "footer-{$name}.php";
-
-        $templates[] = 'footer.php';
-
         // Backward compat code will be removed in a future release
-        if ('' == locate_template($templates, true))
-                load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
+        if ( '' == get_template_part( 'footer', $name ) )
+                load_template( ABSPATH . WPINC . '/theme-compat/footer.php' );
 }
 
 /**
@@ -79 +67 @@
  *
  * @param string $name The name of the specialised sidebar.
  */
-function get_sidebar( $name = null ) {
+function get_sidebar( $name = null, $subfolder = null ) {
         do_action( 'get_sidebar', $name );
 
-        $templates = array();
-        if ( isset($name) )
-                $templates[] = "sidebar-{$name}.php";
-
-        $templates[] = 'sidebar.php';
-
         // Backward compat code will be removed in a future release
-        if ('' == locate_template($templates, true))
-                load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
+        if ( '' == get_template_part( 'sidebar', $name ) )
+                load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php' );
 }
 
 /**
@@ -125 +107 @@
 
         $templates[] = "{$slug}.php";
 
-        locate_template($templates, true, false);
+        return locate_template($templates, true, false);
 }
 
 /**