From d70744e95c9f9398129c0f4ab57c719e7ba4aa5f Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 29 Oct 2014 02:43:22 +0000
Subject: [PATCH] Correct some logic to populate the `defaultValue` variable
 when `data.defaultValue` begins with a hash symbol.

Props antpb
Fixes #30125

Built from https://develop.svn.wordpress.org/trunk@30087


git-svn-id: http://core.svn.wordpress.org/trunk@30087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-customize-control.php | 2 ++
 wp-includes/version.php                    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index cbb7cdde5d..a790b71115 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -554,6 +554,8 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 		if ( data.defaultValue ) {
 			if ( '#' !== data.defaultValue.substring( 0, 1 ) ) {
 				defaultValue = '#' + data.defaultValue;
+			} else {
+				defaultValue = data.defaultValue;
 			}
 			defaultValue = ' data-default-color=' + defaultValue; // Quotes added automatically.
 		} #>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8a98fa7805..30cc209e6f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30086';
+$wp_version = '4.1-alpha-30087';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.