From a5a13979bdd408477167c5cbf6fefba84c347855 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 21 Apr 2012 21:00:24 +0000
Subject: [PATCH] A child theme with a missing parent might be is_child_theme()
 but not have a valid parent() object, so we need to check parent() too. see
 #20103.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/theme-editor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 5aad0968c..f782a887e 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -164,7 +164,7 @@ if ( $allowed_files ) :
 	if ( $has_templates || $theme->is_child_theme() ) :
 ?>
 	<h3><?php _e('Templates'); ?></h3>
-	<?php if ( $theme->is_child_theme() ) : ?>
+	<?php if ( $theme->is_child_theme() && $theme->parent() ) : ?>
 	<p class="howto"><?php printf( __( 'This child theme inherits templates from a parent theme, %s.' ), '<a href="' . self_admin_url('theme-editor.php?theme=' . urlencode( $theme->get_template() ) ) . '">' . $theme->parent()->display('Name') . '</a>' ); ?></p>
 	<?php endif; ?>
 	<ul>