Changeset 43766

Timestamp:

10/19/2018 11:13:57 AM (8 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)
• tests/phpunit/includes/testcase-rest-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api.php (modified) (1 diff)

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 );

branches/5.0/tests/phpunit/includes/testcase-rest-controller.php

@@ -41 +41 @@
 
         public function filter_rest_url_for_leading_slash( $url, $path ) {
-                if ( is_multisite() || get_option( 'permalink_structure' ) ) {
+                if ( is_multisite() ) {
                         return $url;
                 }

branches/5.0/tests/phpunit/tests/rest-api.php

@@ -487 +487 @@
                 set_current_screen( 'front' );
 
+        }
+
+        /**
+         * @ticket 42452
+         */
+        public function test_always_prepend_path_with_slash_in_rest_url_filter() {
+                $filter = new MockAction();
+                add_filter( 'rest_url', array( $filter, 'filter' ), 10, 2 );
+
+                // Passing no path should return a slash.
+                get_rest_url();
+                $args = $filter->get_args();
+                $this->assertEquals( '/', $args[0][1] );
+                $filter->reset();
+
+                // Paths without a prepended slash should have one added.
+                get_rest_url( null, 'wp/media/' );
+                $args = $filter->get_args();
+                $this->assertEquals( '/wp/media/', $args[0][1] );
+                $filter->reset();
+
+                // Do not modify paths with a prepended slash.
+                get_rest_url( null, '/wp/media/' );
+                $args = $filter->get_args();
+                $this->assertEquals( '/wp/media/', $args[0][1] );
+
+                unset( $filter );
         }