Ticket #35629: 35629.1.diff

src/wp-includes/rest-api/class-wp-rest-server.php

@@ -505 +505 @@
 
                         foreach ( $links as $item ) {
                                 // Determine if the link is embeddable.
-                                if ( empty( $item['embeddable'] ) || strpos( $item['href'], $api_root ) !== 0 ) {
+                                if ( empty( $item['embeddable'] ) || strpos( $item['href'], substr( $api_root, 0, -1 ) ) !== 0 ) {
                                         // Ensure we keep the same order.
                                         $embeds[] = array();
                                         continue;
                                 }
 
                                 // Run through our internal routing and serve.
-                                $route = substr( $item['href'], strlen( untrailingslashit( $api_root ) ) );
                                 $query_params = array();
 
                                 // Parse out URL query parameters.
-                                $parsed = parse_url( $route );
-                                if ( empty( $parsed['path'] ) ) {
+                                $parsed = parse_url( $item['href'] );
+                                if ( ! empty( $parsed['query'] ) ) {
+                                        parse_str( $parsed['query'], $query_params );
+                                } else {
+                                        $query_params = array();
+                                }
+
+                                if ( ! empty( $query_params['rest_route'] ) ) {
+                                        $path = $query_params['rest_route'];
+                                        unset( $query_params['rest_route'] );
+                                } else if ( ! empty( $parsed['path'] ) ) {
+                                        $path = $parsed['path'];
+                                } else {
                                         $embeds[] = array();
                                         continue;
                                 }
 
-                                if ( ! empty( $parsed['query'] ) ) {
-                                        parse_str( $parsed['query'], $query_params );
-
-                                        // Ensure magic quotes are stripped.
-                                        if ( get_magic_quotes_gpc() ) {
-                                                $query_params = stripslashes_deep( $query_params );
-                                        }
+                                // Ensure magic quotes are stripped.
+                                if ( ! empty( $query_params ) && get_magic_quotes_gpc() ) {
+                                        $query_params = stripslashes_deep( $query_params );
                                 }
 
                                 // Embedded resources get passed context=embed.
@@ -536 +542 @@
                                         $query_params['context'] = 'embed';
                                 }
 
-                                $request = new WP_REST_Request( 'GET', $parsed['path'] );
+                                $request = new WP_REST_Request( 'GET', $path );
 
                                 $request->set_query_params( $query_params );
                                 $response = $this->dispatch( $request );

tests/phpunit/tests/rest-api/rest-server.php

@@ -423 +423 @@
                 ) );
 
                 $response = new WP_REST_Response();
-                $response->add_link( 'alternate', rest_url( '/test/embeddable?parsed_params=yes' ), array( 'embeddable' => true ) );
+                $response->add_link( 'alternate', add_query_arg( 'parsed_params', 'yes', rest_url( '/test/embeddable' ) ), array( 'embeddable' => true ) );
 
                 $data = $this->server->response_to_data( $response, true );
 
@@ -438 +438 @@
          * @depends test_link_embedding_params
          */
         public function test_link_embedding_error() {
-                // Register our testing route.
-                $this->server->register_route( 'test', '/test/embeddable', array(
-                        'methods' => 'GET',
+                register_rest_route( 'test', '/test/embeddable', array(
+                        'methods'  => 'GET',
                         'callback' => array( $this, 'embedded_response_callback' ),
                 ) );
 
-                $response = new WP_REST_Response();
-                $response->add_link( 'up', rest_url( '/test/embeddable?error=1' ), array( 'embeddable' => true ) );
-
+                $request = new WP_REST_Request( 'GET', '/test/test/embeddable' );
+                $request->set_param( '_embed', 1 );
+                $request->set_param( 'embed_error', 1 );
+                $response = $this->server->dispatch( $request );
                 $data = $this->server->response_to_data( $response, true );
 
                 $this->assertArrayHasKey( '_embedded', $data );
@@ -488 +488 @@
                         'parameters' => $params,
                 );
 
-                return $data;
+                $response = rest_ensure_response( $data );
+                if ( ! empty( $request['embed_error'] ) ) {
+                        $response->add_link( 'up', add_query_arg( 'error', 1, rest_url( '/test/test/embeddable' ) ), array( 'embeddable' => true ) );
+                }
+
+                return $response;
         }
 
         public function test_removing_links() {