From 1e500bd76a11b1d3fcc14d1b8c669102a51141d7 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 25 Apr 2012 17:34:19 +0000
Subject: [PATCH] Remove WP_Theme::is_child_theme() in favor of
 WP_Theme::parent(). see #20546.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/theme-editor.php      |  2 +-
 wp-includes/class-wp-theme.php | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 84a48a9a6f..048649c3ad 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -213,7 +213,7 @@ else : ?>
 	<?php endif; ?>
 
 		<div>
-		<?php if ( is_child_theme() && ! $theme->is_child_theme() && $theme->get_template() == get_template() ) : ?>
+		<?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
 			<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
 			<?php _e( 'This is a file in your current parent theme.' ); ?></p>
 		<?php endif; ?>
diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index 56164decfb..3a56ddca37 100644
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -744,18 +744,6 @@ final class WP_Theme implements ArrayAccess {
 		return $this->template;
 	}
 
-	/**
-	 * Whether a theme is a child theme.
-	 *
-	 * @since 3.4.0
-	 * @access public
-	 *
-	 * @return bool True if a theme is a child theme, false otherwise.
-	 */
-	public function is_child_theme() {
-		return $this->template !== $this->stylesheet;
-	}
-
 	/**
 	 * Returns the absolute path to the directory of a theme's "stylesheet" files.
 	 *