From eb7d4e9c3146fa2dc82ea30bfedf5e7589b2a841 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sun, 5 Apr 2015 15:19:28 +0000
Subject: [PATCH] Add parameter and return descriptions for
 `WP_Customize_Widgets->get_setting_type()`.

See [31370]. See #31888.

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


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

diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php
index ef40e2d340..42cc7ab583 100644
--- a/wp-includes/class-wp-customize-widgets.php
+++ b/wp-includes/class-wp-customize-widgets.php
@@ -105,10 +105,10 @@ final class WP_Customize_Widgets {
 	 * Get the widget setting type given a setting ID.
 	 *
 	 * @since 4.2.0
+	 * @access protected
 	 *
-	 * @param $setting_id
-	 *
-	 * @return string|null
+	 * @param $setting_id Setting ID.
+	 * @return string|null Setting type. Null otherwise.
 	 */
 	protected function get_setting_type( $setting_id ) {
 		static $cache = array();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 326ea1e8da..7c1194d51a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32034';
+$wp_version = '4.2-beta4-32035';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.