Changeset 14365

Timestamp:

05/03/2010 09:57:24 AM (14 years ago)

Author:

westi

Message:

First pass of compatibility code for old themes which relied on using templates from the default theme without expressly identifying it as the parent theme.
Fixes #12425 and #13009.
The fallback to these template files is now depreceated and will be removed in a future version.

Location:

trunk/wp-includes

Files:

• comment-template.php (modified) (1 diff)
• general-template.php (modified) (6 diffs)
• theme-compat (added)
• theme-compat/comments-popup.php (added)
• theme-compat/comments.php (added)
• theme-compat/footer.php (added)
• theme-compat/header.php (added)
• theme-compat/sidebar.php (added)
• theme.php (modified) (2 diffs)

trunk/wp-includes/comment-template.php

@@ -890 +890 @@
     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');
 }
 

trunk/wp-includes/general-template.php

@@ -11 +11 @@
  *
  * 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
@@ -32 +31 @@
     $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');
 }
 
@@ -40 +40 @@
  *
  * 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
@@ -61 +60 @@
     $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');
 }
 
@@ -69 +69 @@
  *
  * 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
@@ -90 +89 @@
     $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');
 }
 

trunk/wp-includes/theme.php

@@ -984 +984 @@
  *
  * 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 WP_FALLBACK_THEME theme. The WP_FALLBACK_THEME theme must then exist for it to
- * work.
+ * parent template.
  *
  * @since 1.5.0
@@ -995 +993 @@
 function get_comments_popup_template() {
     $template = locate_template(array("comments-popup.php"));
+
+    // Backward compat code will be removed in a future release
     if ('' == $template)
-        $template = get_theme_root() . '/' . WP_FALLBACK_THEME . '/comments-popup.php';
+        $template = WPINC . '/theme-compat/comments-popup.php';
 
     return apply_filters('comments_popup_template', $template);