Changeset 41047 for trunk/src/wp-includes/class-wp-oembed-controller.php

Timestamp:

07/14/2017 04:04:04 PM (7 years ago)

Author:

westonruter

Message:

REST API: Ensure maxwidth and maxheight params are forwarded to oEmbed provider in proxy requests.

Also correct phpdoc return tag on WP_oEmbed_Controller::get_proxy_item() and remove dead code in oEmbed controller phpunit tests.

Amends [40628].
See #40450.
Fixes #41299.

File:

• trunk/src/wp-includes/class-wp-oembed-controller.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-oembed-controller.php

@@ -154 +154 @@
      * @see WP_oEmbed::get_html()
      * @param WP_REST_Request $request Full data about the request.
-     * @return WP_Error|array oEmbed response data or WP_Error on failure.
+     * @return object|WP_Error oEmbed response data or WP_Error on failure.
      */
     public function get_proxy_item( $request ) {
@@ -170 +170 @@
         unset( $args['url'] );
 
+        // Copy maxwidth/maxheight to width/height since WP_oEmbed::fetch() uses these arg names.
+        if ( isset( $args['maxwidth'] ) ) {
+            $args['width'] = $args['maxwidth'];
+        }
+        if ( isset( $args['maxheight'] ) ) {
+            $args['height'] = $args['maxheight'];
+        }
+
         $data = _wp_oembed_get_object()->get_data( $url, $args );