From 4f16590e8ecb811a0ad5d13f9cf6385a3ccc4570 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 20 Oct 2015 03:48:26 +0000
Subject: [PATCH] Customizer: when available, show the `description` when
 rendering the `dropdown-pages` Control.

Props downstairsdev, MikeHansenMe, _smartik_.
Fixes #31540.

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


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

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 5a42d368c8..3257b6c238 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -474,7 +474,16 @@ class WP_Customize_Control {
 				<?php
 				break;
 			case 'dropdown-pages':
-				$dropdown = wp_dropdown_pages(
+				?>
+				<label>
+				<?php if ( ! empty( $this->label ) ) : ?>
+					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+				<?php endif;
+				if ( ! empty( $this->description ) ) : ?>
+					<span class="description customize-control-description"><?php echo $this->description; ?></span>
+				<?php endif; ?>
+
+				<?php $dropdown = wp_dropdown_pages(
 					array(
 						'name'              => '_customize-dropdown-pages-' . $this->id,
 						'echo'              => 0,
@@ -486,12 +495,10 @@ class WP_Customize_Control {
 
 				// Hackily add in the data link parameter.
 				$dropdown = str_replace( '<select', '<select ' . $this->get_link(), $dropdown );
-
-				printf(
-					'<label class="customize-control-select"><span class="customize-control-title">%s</span> %s</label>',
-					$this->label,
-					$dropdown
-				);
+				echo $dropdown;
+				?>
+				</label>
+				<?php
 				break;
 			default:
 				?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4095d738c3..966a1a62f3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35274';
+$wp_version = '4.4-alpha-35275';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.