Ticket #16996: 16996-2.diff

wp-includes/class-oembed.php

@@ -163 +163 @@
          * @return bool|object False on failure, otherwise the result in the form of an object.
          */
         function fetch( $provider, $url, $args = '' ) {
+                // Add any URL query arguments to the oEmbed arguments - shortcode args have priority
+                $link_args = parse_url( $url, PHP_URL_QUERY );
+                wp_parse_str( $link_args, $link_args );
+                $args = wp_parse_args( $args, $link_args );
+                
+                // Add any default oEmbed arguments - existing args have priority
                 $args = wp_parse_args( $args, wp_embed_defaults() );
 
                 $provider = add_query_arg( 'maxwidth', $args['width'], $provider );
                 $provider = add_query_arg( 'maxheight', $args['height'], $provider );
                 $provider = add_query_arg( 'url', urlencode($url), $provider );
+                
+                // hackish way to remove strangely (non-oAuth) named args
+                unset($args['width']);
+                unset($args['height']);
+                unset($args['discover']);
+                
+                $provider = add_query_arg( $args, $provider );
 
                 foreach( array( 'json', 'xml' ) as $format ) {
                         $result = $this->_fetch_with_format( $provider, $format );