Changeset 19315

Timestamp:

11/16/2011 10:55:59 PM (15 years ago)

Author:

ryan

Message:

Revert [18665]. Causes fatal double include in themes that call get_header() twice. 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 ( '' == get_template_part( 'header', $name ) )
-                load_template( ABSPATH . WPINC . '/theme-compat/header.php' );
+        if ('' == locate_template($templates, true))
+                load_template( ABSPATH . WPINC . '/theme-compat/header.php');
 }
 
@@ -48 +54 @@
         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 ( '' == get_template_part( 'footer', $name ) )
-                load_template( ABSPATH . WPINC . '/theme-compat/footer.php' );
+        if ('' == locate_template($templates, true))
+                load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
 }
 
@@ -71 +83 @@
         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 ( '' == get_template_part( 'sidebar', $name ) )
-                load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php' );
+        if ('' == locate_template($templates, true))
+                load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
 }
 
@@ -108 +126 @@
         $templates[] = "{$slug}.php";
 
-        return locate_template($templates, true, false);
+        locate_template($templates, true, false);
 }