Ticket #20151: 20151.2.diff

src/wp-includes/class-oembed.php

@@ -277 +277 @@
          * @return bool|object False on failure, otherwise the result in the form of an object.
          */
         public function fetch( $provider, $url, $args = '' ) {
-                $args = wp_parse_args( $args, wp_embed_defaults() );
+                $args = wp_parse_args( $args, wp_embed_defaults( $url ) );
 
                 $provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
                 $provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );

src/wp-includes/class-wp-embed.php

@@ -150 +150 @@
                         return '';
 
                 $rawattr = $attr;
-                $attr = wp_parse_args( $attr, wp_embed_defaults() );
+                $attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
 
                 // kses converts & into & and we need to undo this
                 // See http://core.trac.wordpress.org/ticket/11311

src/wp-includes/media.php

@@ -2059 +2059 @@
  *
  * @since 2.9.0
  *
+ * @param string $url Optional. The URL that should be embedded. Default empty.
+ *
  * @return array Default embed parameters.
  */
-function wp_embed_defaults() {
+function wp_embed_defaults( $url = '' ) {
         if ( ! empty( $GLOBALS['content_width'] ) )
                 $width = (int) $GLOBALS['content_width'];
 
@@ -2077 +2079 @@
          *
          * @param int $width  Width of the embed in pixels.
          * @param int $height Height of the embed in pixels.
+         * @param string $url The URL that should be embedded by default.
          */
-        return apply_filters( 'embed_defaults', compact( 'width', 'height' ) );
+        return apply_filters( 'embed_defaults', compact( 'width', 'height' ), $url );
 }
 
 /**