Changeset 18665

Timestamp:

09/13/2011 04:17:14 PM (14 years ago)

Author:

nacin

Message:

Use get_template_part() in get_header(), get_sidebar(), get_footer(). props scribu, see #18331.

File:

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

trunk/wp-includes/general-template.php

@@ -25 +25 @@
     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' );
 }
 
@@ -54 +48 @@
     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' );
 }
 
@@ -83 +71 @@
     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' );
 }
 
@@ -126 +108 @@
     $templates[] = "{$slug}.php";
 
-    locate_template($templates, true, false);
+    return locate_template($templates, true, false);
 }