From 0507fd7a00df3d117bbbe4b8961a9b5bf3bd4f04 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 30 Mar 2012 16:35:51 +0000
Subject: [PATCH] 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
---
 wp-admin/includes/schema.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index bba0871d6..1e58251bd 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -344,7 +344,7 @@ function populate_options() {
 	$template = WP_DEFAULT_THEME;
 	// If default theme is a child theme, we need to get its template
 	$theme = wp_get_theme( $template );
-	if ( ! $theme->errors() )
+	if ( $theme && ! $theme->errors() )
 		$template = $theme->get_template();
 
 	$timezone_string = '';