From e0c9ba2d63da345166ea409d944f12205d85d3d6 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Thu, 13 Nov 2014 11:44:23 +0000
Subject: [PATCH] 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
---
 wp-includes/class-wp-customize-control.php | 4 ++--
 wp-includes/version.php                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 49dcdc1e86..f496f009fb 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -616,10 +616,10 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 		} #>
 		<label>
 			<# if ( data.label ) { #>
-				<span class="customize-control-title">{{ data.label }}</span>
+				<span class="customize-control-title">{{{ data.label }}}</span>
 			<# } #>
 			<# 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">
 				<input class="color-picker-hex" type="text" maxlength="7" placeholder="<?php esc_attr_e( 'Hex Value' ); ?>" {{ defaultValue }} />
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8d976e0b1c..668cbd71c5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.