From d62b91f2289a744da1cb61f5de4a245a14f92464 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 21 Apr 2012 21:03:23 +0000
Subject: [PATCH] Adjust [20557] and check only parent(), as it is more
 semantic. We don't care if the theme considers itself to be a child theme, we
 care if it has a valid parent. see #20103.

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

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index f782a887e..3ea3c4ae5 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -161,10 +161,10 @@ foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_them
 	<div id="templateside">
 <?php
 if ( $allowed_files ) :
-	if ( $has_templates || $theme->is_child_theme() ) :
+	if ( $has_templates || $theme->parent() ) :
 ?>
 	<h3><?php _e('Templates'); ?></h3>
-	<?php if ( $theme->is_child_theme() && $theme->parent() ) : ?>
+	<?php if ( $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>