Ticket #6801: 6801.003.diff

trunk/wp-includes/template-loader.php

@@ -23 +23 @@
         } else if ( is_tax() && $template = get_taxonomy_template()) {
                 include($template);
                 return;
+        } else if ( is_front_page() && 'page' == get_option('show_on_front') && $template = get_static_front_page_template() ) {
+                include($template);
+                return;
         } else if ( is_home() && $template = get_home_template() ) {
                 include($template);
                 return;

trunk/wp-includes/theme.php

@@ -399 +399 @@
         return get_query_template('date');
 }
 
+function get_static_front_page_template() {
+        $template = '';
+
+        $template = get_page_template();
+        if ( in_array($template, array('page.php', '')) && file_exists(TEMPLATEPATH . "/front-page.php") ) {
+                $template = TEMPLATEPATH . "/front-page.php";
+        }
+
+        return apply_filters('static_front_page_template', $template);
+}
+
 function get_home_template() {
         $template = '';