From 3c7a504ed487ba343d8a7dd467af7f6efafff13d Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@git.wordpress.org>
Date: Wed, 11 Oct 2017 04:25:57 +0000
Subject: [PATCH] Customize: Prevent outputting `value` attribute if already
 supplied among `input_attrs`.

This allows for `input[type=button]` controls to be added without producing illegal HTML.

Amends [41740].
See #30738, #33085.


git-svn-id: https://develop.svn.wordpress.org/trunk@41822 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/class-wp-customize-control.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/wp-includes/class-wp-customize-control.php b/src/wp-includes/class-wp-customize-control.php
index 777dec72e3..61421b7a59 100644
--- a/src/wp-includes/class-wp-customize-control.php
+++ b/src/wp-includes/class-wp-customize-control.php
@@ -649,7 +649,9 @@ class WP_Customize_Control {
 					type="<?php echo esc_attr( $this->type ); ?>"
 					<?php echo $describedby_attr; ?>
 					<?php $this->input_attrs(); ?>
-					value="<?php echo esc_attr( $this->value() ); ?>"
+					<?php if ( ! isset( $this->input_attrs['value'] ) ) : ?>
+						value="<?php echo esc_attr( $this->value() ); ?>"
+					<?php endif; ?>
 					<?php $this->link(); ?>
 					/>
 				<?php