diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index e5a2254672..2247f0a063 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -889,8 +889,8 @@ function comments_template( $file = '/comments.php', $separate_comments = false require( $include ); elseif ( file_exists( TEMPLATEPATH . $file ) ) require( TEMPLATEPATH . $file ); - else - require( get_theme_root() . '/'.WP_FALLBACK_THEME.'/comments.php'); + else // Backward compat code will be removed in a future release + require( WPINC . '/theme-compat/comments.php'); } /** diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index e5130b58a4..d5ed674db2 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -10,8 +10,7 @@ * Load header template. * * 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 WP_FALLBACK_THEME theme will be included. + * specialised header will be included. * * For the parameter, if the file is called "header-special.php" then specify * "special". @@ -31,16 +30,16 @@ function get_header( $name = null ) { $templates[] = "header.php"; + // Backward compat code will be removed in a future release if ('' == locate_template($templates, true)) - load_template( get_theme_root() . '/'. WP_FALLBACK_THEME. '/header.php'); + load_template( WPINC . '/theme-compat/header.php'); } /** * Load footer template. * * Includes the footer template for a theme or if a name is specified then a - * specialised footer will be included. If the theme contains no footer.php file - * then the footer from the default theme will be included. + * specialised footer will be included. * * For the parameter, if the file is called "footer-special.php" then specify * "special". @@ -60,16 +59,16 @@ function get_footer( $name = null ) { $templates[] = "footer.php"; + // Backward compat code will be removed in a future release if ('' == locate_template($templates, true)) - load_template( get_theme_root() . '/' . WP_FALLBACK_THEME . '/footer.php'); + load_template( WPINC . '/theme-compat/footer.php'); } /** * Load sidebar template. * * Includes the sidebar template for a theme or if a name is specified then a - * specialised sidebar will be included. If the theme contains no sidebar.php - * file then the sidebar from the default theme will be included. + * specialised sidebar will be included. * * For the parameter, if the file is called "sidebar-special.php" then specify * "special". @@ -89,8 +88,9 @@ function get_sidebar( $name = null ) { $templates[] = "sidebar.php"; + // Backward compat code will be removed in a future release if ('' == locate_template($templates, true)) - load_template( get_theme_root() . '/' . WP_FALLBACK_THEME . '/sidebar.php'); + load_template( WPINC . '/theme-compat/sidebar.php'); } /** diff --git a/wp-includes/theme-compat/comments-popup.php b/wp-includes/theme-compat/comments-popup.php new file mode 100644 index 0000000000..7223d407f1 --- /dev/null +++ b/wp-includes/theme-compat/comments-popup.php @@ -0,0 +1,129 @@ + + +
+RSS feed for comments on this post.
+ + +The URL to TrackBack this entry is:
+ + + + + +No comments yet.
+ + + +Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed:
Sorry, the comment form is closed at this time.
+ + + + + +Sorry, no posts matched your criteria.
+ + + +Powered by WordPress
+ + + + \ No newline at end of file diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php new file mode 100644 index 0000000000..e10ce6032e --- /dev/null +++ b/wp-includes/theme-compat/comments.php @@ -0,0 +1,101 @@ + + + + + + + +You must be logged in to post a comment.
+ + + + + +
by — @
+