Changeset 43766 for branches/5.0/src/wp-includes/rest-api.php

Timestamp:

10/19/2018 11:13:57 AM (7 years ago)

Author:

danielbachhuber

Message:

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.
Merges [42250] to the 5.0 branch.
Partially reverts [43720].
Fixes #42452. See #41451, #45017.

Location:

branches/5.0

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api.php (modified) (3 diffs)

branches/5.0/src/wp-includes/rest-api.php

@@ -326 +326 @@
     }
 
+    $path = '/' . ltrim( $path, '/' );
+
     if ( is_multisite() && get_blog_option( $blog_id, 'permalink_structure' ) || get_option( 'permalink_structure' ) ) {
         global $wp_rewrite;
@@ -335 +337 @@
         }
 
-        $url .= '/' . ltrim( $path, '/' );
+        $url .= $path;
     } else {
         $url = trailingslashit( get_home_url( $blog_id, '', $scheme ) );
@@ -343 +345 @@
             $url .= 'index.php';
         }
-
-        $path = '/' . ltrim( $path, '/' );
 
         $url = add_query_arg( 'rest_route', $path, $url );