WordPress 4.7

[autoinstalls/wordpress.git] / wp-includes / template-loader.php

diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php
index 01287bf7d398abcb180ebc96b798fd296b89ff66..1ee7c222c11b56d06882fdb826b725a5e1aa1291 100644 (file)
--- a/wp-includes/template-loader.php
+++ b/wp-includes/template-loader.php
@@ -7,12 +7,12 @@ if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
        /**
         * Fires before determining which template to load.
         *
-        * @since 1.5.2
+        * @since 1.5.0
         */
        do_action( 'template_redirect' );
 
 /**
- * Filter whether to allow 'HEAD' requests to generate content.
+ * Filters whether to allow 'HEAD' requests to generate content.
  *
  * Provides a significant performance bump by exiting before the page
  * content loads for 'HEAD' requests. See #14348.
@@ -43,7 +43,8 @@ endif;
 
 if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
        $template = false;
-       if     ( is_404()            && $template = get_404_template()            ) :
+       if     ( is_embed()          && $template = get_embed_template()          ) :
+       elseif ( is_404()            && $template = get_404_template()            ) :
        elseif ( is_search()         && $template = get_search_template()         ) :
        elseif ( is_front_page()     && $template = get_front_page_template()     ) :
        elseif ( is_home()           && $template = get_home_template()           ) :
@@ -53,24 +54,29 @@ if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
                remove_filter('the_content', 'prepend_attachment');
        elseif ( is_single()         && $template = get_single_template()         ) :
        elseif ( is_page()           && $template = get_page_template()           ) :
+       elseif ( is_singular()       && $template = get_singular_template()       ) :
        elseif ( is_category()       && $template = get_category_template()       ) :
        elseif ( is_tag()            && $template = get_tag_template()            ) :
        elseif ( is_author()         && $template = get_author_template()         ) :
        elseif ( is_date()           && $template = get_date_template()           ) :
        elseif ( is_archive()        && $template = get_archive_template()        ) :
-       elseif ( is_comments_popup() && $template = get_comments_popup_template() ) :
-       elseif ( is_paged()          && $template = get_paged_template()          ) :
        else :
                $template = get_index_template();
        endif;
        /**
-        * Filter the path of the current template before including it.
+        * Filters the path of the current template before including it.
         *
         * @since 3.0.0
         *
         * @param string $template The path of the template to include.
         */
-       if ( $template = apply_filters( 'template_include', $template ) )
+       if ( $template = apply_filters( 'template_include', $template ) ) {
                include( $template );
+       } elseif ( current_user_can( 'switch_themes' ) ) {
+               $theme = wp_get_theme();
+               if ( $theme->errors() ) {
+                       wp_die( $theme->errors() );
+               }
+       }
        return;
 endif;