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

Customizer: Prevent double-encoding in `WP_Customize_Control`. 

Control's label and description may include HTML.

fixes #29572.
Built from https://develop.svn.wordpress.org/trunk@30326


git-svn-id: http://core.svn.wordpress.org/trunk@30325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2014-11-13 11:44:23 +00:00
parent 3acf55cf96
commit e0c9ba2d63
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-wp-customize-control.php
View File

@ -616,10 +616,10 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
} #> } #>
<label> <label>
<# if ( data.label ) { #> <# if ( data.label ) { #>
<span class="customize-control-title">{{ data.label }}</span> <span class="customize-control-title">{{{ data.label }}}</span>
<# } #> <# } #>
<# if ( data.description ) { #> <# if ( data.description ) { #>
<span class="description customize-control-description">{{ data.description }}</span> <span class="description customize-control-description">{{{ data.description }}}</span>
<# } #> <# } #>
<div class="customize-control-content"> <div class="customize-control-content">
<input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e( 'Hex Value' ); ?>" {{ defaultValue }} /> <input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e( 'Hex Value' ); ?>" {{ defaultValue }} />

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30325'; $wp_version = '4.1-alpha-30326';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.