Ticket #6801: 6801.006.diff

trunk/wp-includes/template-loader.php

@@ -26 +26 @@
         } else if ( is_home() && $template = get_home_template() ) {
                 include($template);
                 return;
+        } else if ( is_front_page() && $template = get_front_page_template() ) {
+                include($template);
+                return;
         } else if ( is_attachment() && $template = get_attachment_template() ) {
                 remove_filter('the_content', 'prepend_attachment');
                 include($template);
@@ -75 +78 @@
         }
 }
 
-?>
- No newline at end of file
+?>

trunk/wp-includes/theme.php

@@ -667 +667 @@
 /**
  * Retrieve path of home template in current or parent template.
  *
- * Attempts to locate 'home.php' first before falling back to 'index.php'.
+ * Attempts to locate 'home.php'.
  *
  * @since 1.5.0
  * @uses apply_filters() Calls 'home_template' on file path of home template.
@@ -675 +675 @@
  * @return string
  */
 function get_home_template() {
-        $template = locate_template(array('home.php', 'index.php'));
+        $template = locate_template(array('home.php'));
         return apply_filters('home_template', $template);
 }
 
 /**
+ * Retrieve path of front-page template in current or parent template.
+ *
+ * First attempt is to look for the file in the '_wp_page_template' page meta
+ * data. The second attempt, if the first does not have a file or it's empty, is
+ * to look for 'front-page.php' before falling back to 'page.php'.
+ *
+ * @since 2.9.0
+ * @uses apply_filters() Calls 'front_page_template' on file path of template.
+ *
+ * @return string
+ */
+function get_front_page_template() {
+        global $wp_query;
+
+        $id = (int) $wp_query->post->ID;
+        $template = get_post_meta($id, '_wp_page_template', true);
+
+        if ( 'default' == $template )
+                $template = '';
+
+        $templates = array();
+        if ( !empty($template) && !validate_file($template) )
+                $templates[] = $template;
+
+        $templates[] = "front-page.php";
+        $templates[] = "page.php";
+
+        return apply_filters('front_page_template', locate_template($templates));
+}
+
+/**
  * Retrieve path of page template in current or parent template.
  *
  * First attempt is to look for the file in the '_wp_page_template' page meta