Changeset 36674

Timestamp:

02/24/2016 04:19:44 AM (11 years ago)

Author:

rmccue

Message:

REST API: Use WP_REST_Request::from_url() when embedding.

See #35803.

Location:

trunk

Files:

• src/wp-includes/rest-api/class-wp-rest-server.php (modified) (2 diffs)
• tests/phpunit/tests/rest-api/rest-server.php (modified) (2 diffs)

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

@@ -533 +533 @@
                         foreach ( $links as $item ) {
                                 // Determine if the link is embeddable.
-                                if ( empty( $item['embeddable'] ) || strpos( $item['href'], $api_root ) !== 0 ) {
+                                if ( empty( $item['embeddable'] ) ) {
                                         // Ensure we keep the same order.
                                         $embeds[] = array();
@@ -540 +540 @@
 
                                 // 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'] ) ) {
+                                $request = WP_REST_Request::from_url( $item['href'] );
+                                if ( ! $request ) {
                                         $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 );
-                                        }
-                                }
-
                                 // Embedded resources get passed context=embed.
-                                if ( empty( $query_params['context'] ) ) {
-                                        $query_params['context'] = 'embed';
-                                }
-
-                                $request = new WP_REST_Request( 'GET', $parsed['path'] );
-
-                                $request->set_query_params( $query_params );
+                                if ( empty( $request['context'] ) ) {
+                                        $request['context'] = 'embed';
+                                }
+
                                 $response = $this->dispatch( $request );
 

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

@@ -493 +493 @@
 
                 $response = new WP_REST_Response();
-                $response->add_link( 'alternate', rest_url( '/test/embeddable?parsed_params=yes' ), array( 'embeddable' => true ) );
+                $url = rest_url( '/test/embeddable' );
+                $url = add_query_arg( 'parsed_params', 'yes', $url );
+                $response->add_link( 'alternate', $url, array( 'embeddable' => true ) );
 
                 $data = $this->server->response_to_data( $response, true );
@@ -515 +517 @@
 
                 $response = new WP_REST_Response();
-                $response->add_link( 'up', rest_url( '/test/embeddable?error=1' ), array( 'embeddable' => true ) );
+                $url = rest_url( '/test/embeddable' );
+                $url = add_query_arg( 'error', '1', $url );
+                $response->add_link( 'up', $url, array( 'embeddable' => true ) );
 
                 $data = $this->server->response_to_data( $response, true );