From 67f2b68ed601747ce8d26d0119d87fdfc61781e8 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 3 Dec 2010 22:58:56 +0000
Subject: [PATCH] Sanity text in the theme editor when you have a child theme.
 fixes #15672.

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

diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index bb904510f..ae1f5e6a0 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -224,8 +224,16 @@ if ($allowed_files) :
 	<?php } ?>
 
 		<div>
+		<?php if ( is_child_theme() ) :
+			if ( strpos( $file, $themes[$theme]['Template Dir'] ) === 0 ) { ?>
+				<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
+				<?php printf( __( 'This is a file in your parent theme, &#8220;%s.&#8221;' ), $themes[$theme]['Parent Theme'] ); ?></p>
+			<?php } else { ?>
+				<p><?php printf( __( 'This is a file in your child theme, &#8220;%s.&#8221;' ), $themes[$theme]['Name'] ); ?></p>
+			<?php } ?>
+		<?php endif; ?>
 <?php
-	if ( is_writeable($file) ) :
+	if ( is_writeable( $file ) ) :
 		submit_button( __( 'Update File' ), 'primary', 'submit', true, array( 'tabindex' => '2' ) );
 	else : ?>
 <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>