Ticket #12635: 12635.2.patch

wp-includes/template-loader.php

@@ -35 +35 @@
         elseif ( is_archive()        && $template = get_archive_template()        ) :
         elseif ( is_comments_popup() && $template = get_comments_popup_template() ) :
         elseif ( is_paged()          && $template = get_paged_template()          ) :
-        elseif ( file_exists( TEMPLATEPATH . '/index.php' ) ) :
-                $template = TEMPLATEPATH . '/index.php';
+        else :
+                $template = get_index_template();
         endif;
         if ( $template = apply_filters( 'template_include', $template ) )
                 include( $template );

wp-includes/theme.php

@@ -686 +686 @@
 }
 
 /**
+ * Retrieve path of index template in current or parent template.
+ *
+ * @since 3.0.0
+ *
+ * @return string
+ */
+function get_index_template() {
+        return get_query_template('index');
+}
+
+/**
  * Retrieve path of 404 template in current or parent template.
  *
  * @since 1.5.0