From 44c499329acb1c9bbf4ba7a4a38119b5ba2cc160 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Mon, 22 Aug 2016 00:41:31 +0000
Subject: [PATCH] Docs: Update outdated phpdoc for
 `WP_Customize_Manager::validate_setting_values()` to reflect changes in
 [37942].

Props dlh.
See #37247.
Fixes #37759.

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


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

diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 09e48b290c..daa5884512 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -991,9 +991,10 @@ final class WP_Customize_Manager {
 	/**
 	 * Validates setting values.
 	 *
-	 * Sanitization is applied to the values before being passed for validation.
 	 * Validation is skipped for unregistered settings or for values that are
-	 * already null since they will be skipped anyway.
+	 * already null since they will be skipped anyway. Sanitization is applied
+	 * to values that pass validation, and values that become null or `WP_Error`
+	 * after sanitizing are marked invalid.
 	 *
 	 * @since 4.6.0
 	 * @access public
@@ -1001,7 +1002,7 @@ final class WP_Customize_Manager {
 	 * @see WP_REST_Request::has_valid_params()
 	 * @see WP_Customize_Setting::validate()
 	 *
-	 * @param array $setting_values Mapping of setting IDs to values to sanitize and validate.
+	 * @param array $setting_values Mapping of setting IDs to values to validate and sanitize.
 	 * @return array Mapping of setting IDs to return value of validate method calls, either `true` or `WP_Error`.
 	 */
 	public function validate_setting_values( $setting_values ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 929d6a678a..7e2d056ef2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38298';
+$wp_version = '4.7-alpha-38299';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.