From c148f0aa55c0440a00ba62a16e2554302db34f18 Mon Sep 17 00:00:00 2001
From: "K. Adam White" <kadamwhite@gmail.com>
Date: Thu, 12 Sep 2019 21:47:57 +0000
Subject: [PATCH] REST API: Accept string path in rest_ensure_request.

Update `rest_ensure_request()` to accept a string path, permitting a string path to be passed to `rest_do_request()` as is indicated (previously inaccurately) in that method's PHPDoc.

Props TimothyBlynJacobs, kadamwhite.
Fixes #40614.

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


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

diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php
index 1e4e23617b..89c4e6bb3a 100644
--- a/wp-includes/rest-api.php
+++ b/wp-includes/rest-api.php
@@ -482,8 +482,9 @@ function rest_get_server() {
  * Ensures request arguments are a request object (for consistency).
  *
  * @since 4.4.0
+ * @since 5.3.0 Accept string argument for the request path.
  *
- * @param array|WP_REST_Request $request Request to check.
+ * @param array|string|WP_REST_Request $request Request to check.
  * @return WP_REST_Request REST request instance.
  */
 function rest_ensure_request( $request ) {
@@ -491,6 +492,10 @@ function rest_ensure_request( $request ) {
 		return $request;
 	}
 
+	if ( is_string( $request ) ) {
+		return new WP_REST_Request( 'GET', $request );
+	}
+
 	return new WP_REST_Request( 'GET', '', $request );
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6933162d9d..3a37e57857 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46098';
+$wp_version = '5.3-alpha-46099';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.