--- a/wp/wp-includes/template-loader.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-includes/template-loader.php Mon Oct 14 18:28:13 2019 +0200
@@ -1,15 +1,17 @@
<?php
/**
* Loads the correct template based on the visitor's url
+ *
* @package WordPress
*/
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
+if ( wp_using_themes() ) {
/**
* Fires before determining which template to load.
*
* @since 1.5.0
*/
do_action( 'template_redirect' );
+}
/**
* Filters whether to allow 'HEAD' requests to generate content.
@@ -21,8 +23,9 @@
*
* @param bool $exit Whether to exit without generating any content for 'HEAD' requests. Default true.
*/
-if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) )
+if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) ) {
exit();
+}
// Process feeds and trackbacks even if not using themes.
if ( is_robots() ) :
@@ -41,25 +44,26 @@
return;
endif;
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
+if ( wp_using_themes() ) :
$template = false;
- 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() ) :
+ 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() ) :
+ elseif ( is_privacy_policy() && $template = get_privacy_policy_template() ) :
elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
- elseif ( is_tax() && $template = get_taxonomy_template() ) :
- elseif ( is_attachment() && $template = get_attachment_template() ) :
- 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_tax() && $template = get_taxonomy_template() ) :
+ elseif ( is_attachment() && $template = get_attachment_template() ) :
+ 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() ) :
else :
$template = get_index_template();
endif;