From 1eabd22805024863b53113676b43f8dc78cae7ab Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 26 Mar 2010 13:52:43 +0000 Subject: [PATCH] Introduce get_index_template(). Allows child themes to override a parent theme's index.php. Props koopersmith, fixes #12635 git-svn-id: http://svn.automattic.com/wordpress/trunk@13819 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/template-loader.php | 4 ++-- wp-includes/theme.php | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php index 461a426089..9911bb2728 100644 --- a/wp-includes/template-loader.php +++ b/wp-includes/template-loader.php @@ -35,8 +35,8 @@ if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) : elseif ( is_archive() && $template = get_archive_template() ) : elseif ( is_comments_popup() && $template = get_comments_popup_template() ) : elseif ( is_paged() && $template = get_paged_template() ) : - elseif ( file_exists( TEMPLATEPATH . '/index.php' ) ) : - $template = TEMPLATEPATH . '/index.php'; + else : + $template = get_index_template(); endif; if ( $template = apply_filters( 'template_include', $template ) ) include( $template ); diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 3e3ca319f1..29e677b569 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -685,6 +685,17 @@ function get_query_template($type) { return apply_filters("{$type}_template", locate_template(array("{$type}.php"))); } +/** + * Retrieve path of index template in current or parent template. + * + * @since 3.0.0 + * + * @return string + */ +function get_index_template() { + return get_query_template('index'); +} + /** * Retrieve path of 404 template in current or parent template. *