WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Custom Header: Fix logic when a theme doesn't set `default-text-color`. 

fixes #28042.
Built from https://develop.svn.wordpress.org/trunk@28294


git-svn-id: http://core.svn.wordpress.org/trunk@28122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2014-05-06 15:27:54 +00:00
parent 970477d25e
commit f7539feb4d
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wp-admin/custom-header.php
View File

@ -325,11 +325,20 @@ class Custom_Image_Header {
*
* @since 2.6.0
*/
function js_1() { ?>
function js_1() {
$default_color = '';
if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
$default_color = get_theme_support( 'custom-header', 'default-text-color' );
if ( $default_color && false === strpos( $default_color, '#' ) ) {
$default_color = '#' . $default_color;
}
}
?>
<script type="text/javascript">
/* <![CDATA[ */
(function($){
var default_color = '#<?php echo get_theme_support( 'custom-header', 'default-text-color' ); ?>',
var default_color = '<?php echo $default_color; ?>',
header_text_fields;
function pickColor(color) {
@ -624,17 +633,27 @@ class Custom_Image_Header {
<th scope="row"><?php _e( 'Text Color' ); ?></th>
<td>
<p>
<?php
$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
<?php
$default_color = '';
if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
$default_color = get_theme_support( 'custom-header', 'default-text-color' );
if ( $default_color && false === strpos( $default_color, '#' ) ) {
$default_color = '#' . $default_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>';
}
?>
$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
$header_textcolor = '#' . $header_textcolor;
}
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' ), esc_html( $default_color ) ) . '</span>';
}
?>
</p>
</td>
</tr>