Changeset 28923

Timestamp:

06/30/2014 11:15:33 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Pass $url parameter to wp_embed_defaults() and 'embed_defaults' filter.

props wpsmith, sabreuse, jacobdubail.
fixes #20151.

Location:

trunk/src/wp-includes

Files:

• class-oembed.php (modified) (1 diff)
• class-wp-embed.php (modified) (1 diff)
• media.php (modified) (2 diffs)

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

@@ -278 +278 @@
      */
     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 );

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

@@ -157 +157 @@
 
         $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

trunk/src/wp-includes/media.php

@@ -2083 +2083 @@
  * @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'];
@@ -2099 +2101 @@
      * @since 2.9.0
      *
-     * @param int $width  Width of the embed in pixels.
-     * @param int $height Height of the embed in pixels.
-     */
-    return apply_filters( 'embed_defaults', compact( 'width', 'height' ) );
+     * @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.
+     */
+    return apply_filters( 'embed_defaults', compact( 'width', 'height' ), $url );
 }