From 6c53a37d5bda8af1af91d4eadb50fc5e6fc2d1f4 Mon Sep 17 00:00:00 2001 From: Peter Westwood Date: Thu, 18 Feb 2010 22:09:06 +0000 Subject: [PATCH] Move more references from default to WP_FALLBACK_THEME. To make 'default' theme transition smoother in the future. git-svn-id: https://develop.svn.wordpress.org/trunk@13202 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/general-template.php | 8 ++++---- wp-includes/theme.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 3180f9244e..095ea41919 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -11,7 +11,7 @@ * * Includes the header template for a theme or if a name is specified then a * specialised header will be included. If the theme contains no header.php file - * then the header from the default theme will be included. + * then the header from the WP_FALLBACK_THEME theme will be included. * * For the parameter, if the file is called "header-special.php" then specify * "special". @@ -32,7 +32,7 @@ function get_header( $name = null ) { $templates[] = "header.php"; if ('' == locate_template($templates, true)) - load_template( get_theme_root() . '/default/header.php'); + load_template( get_theme_root() . '/'. WP_FALLBACK_THEME. '/header.php'); } /** @@ -61,7 +61,7 @@ function get_footer( $name = null ) { $templates[] = "footer.php"; if ('' == locate_template($templates, true)) - load_template( get_theme_root() . '/default/footer.php'); + load_template( get_theme_root() . '/' . WP_FALLBACK_THEME . '/footer.php'); } /** @@ -90,7 +90,7 @@ function get_sidebar( $name = null ) { $templates[] = "sidebar.php"; if ('' == locate_template($templates, true)) - load_template( get_theme_root() . '/default/sidebar.php'); + load_template( get_theme_root() . '/' . WP_FALLBACK_THEME . '/sidebar.php'); } /** diff --git a/wp-includes/theme.php b/wp-includes/theme.php index c9891b8f9d..eb3a4be051 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -949,7 +949,7 @@ function get_attachment_template() { * * Checks for comment popup template in current template, if it exists or in the * parent template. If it doesn't exist, then it retrieves the comment-popup.php - * file from the default theme. The default theme must then exist for it to + * file from the WP_FALLBACK_THEME theme. The WP_FALLBACK_THEME theme must then exist for it to * work. * * @since 1.5.0