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

Ensure we get a theme back from wp_get_theme() before checking ->errors(). see #20103. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-03-30 16:35:51 +00:00
parent fba41a5b3a
commit 0507fd7a00
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/schema.php
View File

@ -344,7 +344,7 @@ function populate_options() {
$template = WP_DEFAULT_THEME; $template = WP_DEFAULT_THEME;
// If default theme is a child theme, we need to get its template // If default theme is a child theme, we need to get its template
$theme = wp_get_theme( $template ); $theme = wp_get_theme( $template );
if ( ! $theme->errors() ) if ( $theme && ! $theme->errors() )
$template = $theme->get_template(); $template = $theme->get_template();
$timezone_string = ''; $timezone_string = '';