From 8ffc38ce7c96875713416cd01754dc7966abc7d0 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Wed, 25 Feb 2015 07:56:25 +0000
Subject: [PATCH] Add a missing file header and clean up class DocBlocks in
 wp-includes/class-wp-customize-control.php.

* Adds a file header separate from the `WP_Customize_Control` class block
* Fixes formatting for the `WP_Customize_Control`, `WP_Customize_Color_Control`, `WP_Customize_Upload_Control`, `WP_Customize_Image_Control`, `WP_Customize_Background_Image_Control`, `WP_Customize_Theme_Control`, `WP_Customize_New_Theme_Control`, `WP_Widget_Area_Customize_Control`, and `WP_Widget_Form_Customize_Control` class DocBlocks.
* Adds a missing class DocBlock for `WP_Customize_Header_Image_Control`

See #31446.

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


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

diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 154c5c8107..4447bc248b 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -1,11 +1,17 @@
 <?php
 /**
- * Customize Control Class
+ * WordPress Customize Control classes
  *
  * @package WordPress
  * @subpackage Customize
  * @since 3.4.0
  */
+
+/**
+ * Customize Control class.
+ *
+ * @since 3.4.0
+ */
 class WP_Customize_Control {
 
 	/**
@@ -537,11 +543,11 @@ class WP_Customize_Control {
 }
 
 /**
- * Customize Color Control Class
+ * Customize Color Control class.
  *
- * @package WordPress
- * @subpackage Customize
  * @since 3.4.0
+ *
+ * @see WP_Customize_Control
  */
 class WP_Customize_Color_Control extends WP_Customize_Control {
 	/**
@@ -632,11 +638,11 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 }
 
 /**
- * Customize Upload Control Class
+ * Customize Upload Control class.
  *
- * @package WordPress
- * @subpackage Customize
  * @since 3.4.0
+ *
+ * @see WP_Customize_Control
  */
 class WP_Customize_Upload_Control extends WP_Customize_Control {
 	public $type          = 'upload';
@@ -803,11 +809,11 @@ class WP_Customize_Upload_Control extends WP_Customize_Control {
 }
 
 /**
- * Customize Image Control Class
+ * Customize Image Control class.
  *
- * @package WordPress
- * @subpackage Customize
  * @since 3.4.0
+ *
+ * @see WP_Customize_Upload_Control
  */
 class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
 	public $type = 'image';
@@ -872,11 +878,11 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
 }
 
 /**
- * Customize Background Image Control Class
+ * Customize Background Image Control class.
  *
- * @package WordPress
- * @subpackage Customize
  * @since 3.4.0
+ *
+ * @see WP_Customize_Image_Control
  */
 class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 	public $type = 'background';
@@ -912,6 +918,13 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 	}
 }
 
+/**
+ * Customize Header Image Control class.
+ *
+ * @since 3.4.0
+ *
+ * @see WP_Customize_Image_Control
+ */
 class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	public $type = 'header';
 	public $uploaded_headers;
@@ -1101,11 +1114,11 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 }
 
 /**
- * Customize Theme Control Class
+ * Customize Theme Control class.
  *
- * @package WordPress
- * @subpackage Customize
  * @since 4.2.0
+ *
+ * @see WP_Customize_Control
  */
 class WP_Customize_Theme_Control extends WP_Customize_Control {
 
@@ -1165,11 +1178,11 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 }
 
 /**
- * Customize New Theme Control Class
+ * Customize New Theme Control class.
  *
- * @package WordPress
- * @subpackage Customize
  * @since 4.2.0
+ *
+ * @see WP_Customize_Control
  */
 class WP_Customize_New_Theme_Control extends WP_Customize_Control {
 
@@ -1196,9 +1209,11 @@ class WP_Customize_New_Theme_Control extends WP_Customize_Control {
 }
 
 /**
- * Widget Area Customize Control Class
+ * Widget Area Customize Control class.
  *
  * @since 3.9.0
+ *
+ * @see WP_Customize_Control
  */
 class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
 	public $type = 'sidebar_widgets';
@@ -1228,9 +1243,11 @@ class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
 }
 
 /**
- * Widget Form Customize Control Class
+ * Widget Form Customize Control class.
  *
  * @since 3.9.0
+ *
+ * @see WP_Customize_Control
  */
 class WP_Widget_Form_Customize_Control extends WP_Customize_Control {
 	public $type = 'widget_form';
@@ -1280,4 +1297,3 @@ class WP_Widget_Form_Customize_Control extends WP_Customize_Control {
 		return $this->manager->widgets->is_widget_rendered( $this->widget_id );
 	}
 }
-
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9d1a259169..dfbf1f55c8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31538';
+$wp_version = '4.2-alpha-31539';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.