Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Eric Lewis 2016-01-17 17:29:27 +00:00
parent 82c596594b
commit 435196fc40
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/template-loader.php
View File

@ -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;

2
wp-includes/version.php
View File

@ -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.