From d63af2b6ee6f141274627399f201e39da00b07af Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 4 Apr 2015 23:05:26 +0000
Subject: [PATCH] Add documentation for the `$type`, `$mime_type`, and
 `$button_labels` properties in `WP_Customize_Media_Control`.

See [31698]. See #31888.

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


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

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 8308f4ae18..3c8a71e451 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -645,8 +645,31 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
  * @see WP_Customize_Control
  */
 class WP_Customize_Media_Control extends WP_Customize_Control {
-	public $type          = 'media';
-	public $mime_type     = '';
+	/**
+	 * Control type.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 * @var string
+	 */
+	public $type = 'media';
+
+	/**
+	 * Media control mime type.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 * @var string
+	 */
+	public $mime_type = '';
+
+	/**
+	 * Button labels.
+	 *
+	 * @since 4.2.0
+	 * @access public
+	 * @var array
+	 */
 	public $button_labels = array();
 
 	/**
@@ -687,7 +710,7 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	 * @since 3.4.0
 	 * @since 4.2.0 Moved from WP_Customize_Upload_Control.
 	 *
-	 * @uses WP_Customize_Control::to_json()
+	 * @see WP_Customize_Control::to_json()
 	 */
 	public function to_json() {
 		parent::to_json();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 066df5d73e..2bb4ae42e8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32022';
+$wp_version = '4.2-beta4-32023';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.