From 9b68e5953406024c75b92f7ebe2aef0385c8956e Mon Sep 17 00:00:00 2001
From: Ryan McCue <me@ryanmccue.info>
Date: Tue, 28 Nov 2017 07:10:46 +0000
Subject: [PATCH] REST API: Ensure rest_url() consistently has leading slash.

`rest_url()` inconsistent addes slashes to the passed path depending on whether the site has pretty permalinks enabled. Apart from being inconsistent, this also caused the unit tests to fail when pretty permalinks are enabled.

Props frank-klein.
Fixes #42452. See #41451.

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


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

diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php
index 82d856a063..cba8182af4 100644
--- a/wp-includes/rest-api.php
+++ b/wp-includes/rest-api.php
@@ -307,6 +307,8 @@ function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) {
 		$path = '/';
 	}
 
+	$path = '/' . ltrim( $path, '/' );
+
 	if ( is_multisite() && get_blog_option( $blog_id, 'permalink_structure' ) || get_option( 'permalink_structure' ) ) {
 		global $wp_rewrite;
 
@@ -316,7 +318,7 @@ function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) {
 			$url = get_home_url( $blog_id, rest_get_url_prefix(), $scheme );
 		}
 
-		$url .= '/' . ltrim( $path, '/' );
+		$url .= $path;
 	} else {
 		$url = trailingslashit( get_home_url( $blog_id, '', $scheme ) );
 		// nginx only allows HTTP/1.0 methods when redirecting from / to /index.php
@@ -325,8 +327,6 @@ function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) {
 			$url .= 'index.php';
 		}
 
-		$path = '/' . ltrim( $path, '/' );
-
 		$url = add_query_arg( 'rest_route', $path, $url );
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cc5ec363de..d399707310 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42249';
+$wp_version = '5.0-alpha-42250';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.