From 83eeb80dfb2dba27fe3ac4fc7bd460237e540928 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Tue, 20 Nov 2012 01:53:59 +0000
Subject: [PATCH] Custom Header: Remove Farbtastic-era "Reset Text Color"
 button. Show default color when JS is disabled. props DrewAPicture. fixes
 #22461.

git-svn-id: http://core.svn.wordpress.org/trunk@22695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/custom-header.php | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 6c16328845..57a4afc2b7 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -215,12 +215,6 @@ class Custom_Image_Header {
 			return;
 		}
 
-		if ( isset( $_POST['resettext'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			remove_theme_mod('header_textcolor');
-			return;
-		}
-
 		if ( isset( $_POST['removeheader'] ) ) {
 			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
 			$this->remove_header_image();
@@ -628,24 +622,17 @@ class Custom_Image_Header {
 <?php
 $header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
 $default_color = '';
-if ( current_theme_supports( 'custom-header', 'default-text-color' ) )
-	$default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-header', 'default-text-color' ) ) . '"';
+if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
+	$default_color = '#' . get_theme_support( 'custom-header', 'default-text-color' );
+	$default_color_attr = ' data-default-color="' . esc_attr( $default_color ) . '"';
+	echo '<input type="text" name="text-color" id="text-color" value="#' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
+	if ( $default_color )
+		echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), $default_color ) . '</span>';
+}
 ?>
-		<input type="text" name="text-color" id="text-color" value="#<?php echo esc_attr( $header_textcolor ); ?>"<?php echo $default_color; ?> />
 	</p>
 </td>
 </tr>
-
-	<?php if ( current_theme_supports( 'custom-header', 'default-text-color' ) && get_theme_mod( 'header_textcolor' ) ) { ?>
-<tr valign="top">
-<th scope="row"><?php _e('Reset Text Color'); ?></th>
-<td>
-	<p><?php _e( 'This will restore the original header text. You will not be able to restore any customizations.' ) ?></p>
-	<?php submit_button( __( 'Restore Original Header Text' ), 'button', 'resettext', false ); ?>
-</td>
-</tr>
-	<?php } ?>
-
 </tbody>
 </table>
 <?php endif;