From 435196fc4042d737da1f345def6f64ca9756d84a Mon Sep 17 00:00:00 2001
From: Eric Lewis <eric.andrew.lewis@gmail.com>
Date: Sun, 17 Jan 2016 17:29:27 +0000
Subject: [PATCH] Themes: Show an error message to logged-in users if a
 template file isn't loaded.

On the off-chance the active theme folder is renamed or deleted, a "white screen
of death" was displayed to the user. Instead, the user is shown a useful error
screen displaying any errors the theme has (e.g. if the theme can't be found).

Props MikeHansenMe, SergeyBiryukov.
See #21931.


Built from https://develop.svn.wordpress.org/trunk@36335


git-svn-id: http://core.svn.wordpress.org/trunk@36302 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/template-loader.php | 8 +++++++-
 wp-includes/version.php         | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php
index 297b9704ff..57f1db1ce0 100644
--- a/wp-includes/template-loader.php
+++ b/wp-includes/template-loader.php
@@ -84,7 +84,13 @@ if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
 	 *
 	 * @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 ( is_user_logged_in() ) {
+		$theme = wp_get_theme();
+		if ( $theme->errors() ) {
+			wp_die( $theme->errors() );
+		}
+	}
 	return;
 endif;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1b811f0e9d..92cf406b7d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-1453046591767';
+$wp_version = '4.5-alpha-1453051752378';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.