WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [18665]. Causes fatal double include in themes that call get_header() twice. see #18331 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-11-16 22:55:59 +00:00
parent 2e2c07f094
commit d6612a1faf
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-includes/general-template.php
View File

@ -24,9 +24,15 @@
function get_header( $name = null ) { function get_header( $name = null ) {
do_action( 'get_header', $name ); 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 // Backward compat code will be removed in a future release
if ( '' == get_template_part( 'header', $name ) ) if ('' == locate_template($templates, true))
load_template( ABSPATH . WPINC . '/theme-compat/header.php' ); load_template( ABSPATH . WPINC . '/theme-compat/header.php');
} }
/** /**
@ -47,9 +53,15 @@ function get_header( $name = null ) {
function get_footer( $name = null ) { function get_footer( $name = null ) {
do_action( 'get_footer', $name ); 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 // Backward compat code will be removed in a future release
if ( '' == get_template_part( 'footer', $name ) ) if ('' == locate_template($templates, true))
load_template( ABSPATH . WPINC . '/theme-compat/footer.php' ); load_template( ABSPATH . WPINC . '/theme-compat/footer.php');
} }
/** /**
@ -70,9 +82,15 @@ function get_footer( $name = null ) {
function get_sidebar( $name = null ) { function get_sidebar( $name = null ) {
do_action( 'get_sidebar', $name ); 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 // Backward compat code will be removed in a future release
if ( '' == get_template_part( 'sidebar', $name ) ) if ('' == locate_template($templates, true))
load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php' ); load_template( ABSPATH . WPINC . '/theme-compat/sidebar.php');
} }
/** /**
@ -107,7 +125,7 @@ function get_template_part( $slug, $name = null ) {
$templates[] = "{$slug}.php"; $templates[] = "{$slug}.php";
return locate_template($templates, true, false); locate_template($templates, true, false);
} }
/** /**