diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/template-loader.php
--- a/wp/wp-includes/template-loader.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/template-loader.php	Tue Dec 15 13:49:49 2020 +0100
@@ -24,11 +24,11 @@
  * @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 ) ) {
-	exit();
+	exit;
 }
 
 // Process feeds and trackbacks even if not using themes.
-if ( is_robots() ) :
+if ( is_robots() ) {
 	/**
 	 * Fired when the template loader determines a robots.txt request.
 	 *
@@ -36,37 +36,64 @@
 	 */
 	do_action( 'do_robots' );
 	return;
-elseif ( is_feed() ) :
+} elseif ( is_favicon() ) {
+	/**
+	 * Fired when the template loader determines a favicon.ico request.
+	 *
+	 * @since 5.4.0
+	 */
+	do_action( 'do_favicon' );
+	return;
+} elseif ( is_feed() ) {
 	do_feed();
 	return;
-elseif ( is_trackback() ) :
-	include( ABSPATH . 'wp-trackback.php' );
+} elseif ( is_trackback() ) {
+	require ABSPATH . 'wp-trackback.php';
 	return;
-endif;
+}
+
+if ( wp_using_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() ) :
-	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() ) :
-	else :
+	$tag_templates = array(
+		'is_embed'             => 'get_embed_template',
+		'is_404'               => 'get_404_template',
+		'is_search'            => 'get_search_template',
+		'is_front_page'        => 'get_front_page_template',
+		'is_home'              => 'get_home_template',
+		'is_privacy_policy'    => 'get_privacy_policy_template',
+		'is_post_type_archive' => 'get_post_type_archive_template',
+		'is_tax'               => 'get_taxonomy_template',
+		'is_attachment'        => 'get_attachment_template',
+		'is_single'            => 'get_single_template',
+		'is_page'              => 'get_page_template',
+		'is_singular'          => 'get_singular_template',
+		'is_category'          => 'get_category_template',
+		'is_tag'               => 'get_tag_template',
+		'is_author'            => 'get_author_template',
+		'is_date'              => 'get_date_template',
+		'is_archive'           => 'get_archive_template',
+	);
+	$template      = false;
+
+	// Loop through each of the template conditionals, and find the appropriate template file.
+	foreach ( $tag_templates as $tag => $template_getter ) {
+		if ( call_user_func( $tag ) ) {
+			$template = call_user_func( $template_getter );
+		}
+
+		if ( $template ) {
+			if ( 'is_attachment' === $tag ) {
+				remove_filter( 'the_content', 'prepend_attachment' );
+			}
+
+			break;
+		}
+	}
+
+	if ( ! $template ) {
 		$template = get_index_template();
-	endif;
+	}
+
 	/**
 	 * Filters the path of the current template before including it.
 	 *
@@ -74,8 +101,9 @@
 	 *
 	 * @param string $template The path of the template to include.
 	 */
-	if ( $template = apply_filters( 'template_include', $template ) ) {
-		include( $template );
+	$template = apply_filters( 'template_include', $template );
+	if ( $template ) {
+		include $template;
 	} elseif ( current_user_can( 'switch_themes' ) ) {
 		$theme = wp_get_theme();
 		if ( $theme->errors() ) {
@@ -83,4 +111,4 @@
 		}
 	}
 	return;
-endif;
+}