From e6f620570dd0a3e2197643a9688e2cef79a8a19f Mon Sep 17 00:00:00 2001
From: TimothyBlynJacobs <TimothyBlynJacobs@git.wordpress.org>
Date: Sun, 5 Jul 2020 00:19:02 +0000
Subject: [PATCH] REST API: Correct the return type of
 `rest_sanitize_value_from_schema`.

Fixes #45486.
Props birgire, Jean-David, mukesh27, priyankkpatel.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48076 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/rest-api.php | 2 +-
 wp-includes/version.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php
index 5fdf9530cb..c8435a1919 100644
--- a/wp-includes/rest-api.php
+++ b/wp-includes/rest-api.php
@@ -1718,7 +1718,7 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) {
  * @param mixed  $value The value to sanitize.
  * @param array  $args  Schema array to use for sanitization.
  * @param string $param The parameter name, used in error messages.
- * @return true|WP_Error
+ * @return mixed The sanitized value.
  */
 function rest_sanitize_value_from_schema( $value, $args, $param = '' ) {
 	$allowed_types = array( 'array', 'object', 'string', 'number', 'integer', 'boolean', 'null' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 16aadc661a..7684784cac 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-48306';
+$wp_version = '5.5-alpha-48307';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.