Changeset 12325

Timestamp:

12/06/2009 05:33:53 PM (16 years ago)

Author:

ryan

Message:

Use oEmbed for dailymotion. Props Viper007Bond. see #10337

Location:

trunk/wp-includes

Files:

• class-oembed.php (modified) (2 diffs)
• default-embeds.php (modified) (1 diff)

trunk/wp-includes/class-oembed.php

@@ -41 +41 @@
             'http://blip.tv/file/*'                 => array( 'http://blip.tv/oembed/',                   false ),
             '#http://(www\.)?vimeo\.com/.*#i'       => array( 'http://www.vimeo.com/api/oembed.{format}', true  ),
-            '#http://(www\.)?flickr.com/.*#i'       => array( 'http://www.flickr.com/services/oembed/',   true  ),
-            '#http://(www\.)?hulu.com/watch/.*#i'   => array( 'http://www.hulu.com/api/oembed.{format}',  true  ),
-            '#http://(www\.)?viddler.com/.*#i'      => array( 'http://lab.viddler.com/services/oembed/',  true  ),
+            '#http://(www\.)?dailymotion\.com/.*#i' => array( 'http://www.dailymotion.com/api/oembed',    true  ),
+            '#http://(www\.)?flickr\.com/.*#i'      => array( 'http://www.flickr.com/services/oembed/',   true  ),
+            '#http://(www\.)?hulu\.com/watch/.*#i'  => array( 'http://www.hulu.com/api/oembed.{format}',  true  ),
+            '#http://(www\.)?viddler\.com/.*#i'     => array( 'http://lab.viddler.com/services/oembed/',  true  ),
             'http://qik.com/*'                      => array( 'http://qik.com/api/oembed.{format}',       false ),
             'http://revision3.com/*'                => array( 'http://revision3.com/api/oembed/',         false ),
             'http://i*.photobucket.com/albums/*'    => array( 'http://photobucket.com/oembed',            false ),
             'http://gi*.photobucket.com/groups/*'   => array( 'http://photobucket.com/oembed',            false ),
-            '#http://(www\.)?scribd.com/.*#i'       => array( 'http://www.scribd.com/services/oembed',    true  ),
+            '#http://(www\.)?scribd\.com/.*#i'      => array( 'http://www.scribd.com/services/oembed',    true  ),
             'http://wordpress.tv/*'                 => array( 'http://wordpress.tv/oembed/',              false ),
         ) );
@@ -266 +267 @@
     return $wp_oembed;
 }
+
+?>

trunk/wp-includes/default-embeds.php

@@ -50 +50 @@
 wp_embed_register_handler( 'polldaddy', '#http://answers.polldaddy.com/poll/(\d+)(.*?)#i', 'wp_embed_handler_polldaddy' );
 
-/**
- * The DailyMotion.com embed handler callback. DailyMotion does not support oEmbed.
- *
- * @see WP_Embed::register_handler()
- * @see WP_Embed::shortcode()
- *
- * @param array $matches The regex matches from the provided regex when calling {@link wp_embed_register_handler()}.
- * @param array $attr Embed attributes.
- * @param string $url The original URL that was matched by the regex.
- * @param array $rawattr The original unmodified attributes.
- * @return string The embed HTML.
- */
-function wp_embed_handler_dailymotion( $matches, $attr, $url, $rawattr ) {
-    // If the user supplied a fixed width AND height, use it
-    if ( !empty($rawattr['width']) && !empty($rawattr['height']) ) {
-        $width  = (int) $rawattr['width'];
-        $height = (int) $rawattr['height'];
-    } else {
-        list( $width, $height ) = wp_expand_dimensions( 480, 291, $attr['width'], $attr['height'] );
-    }
-
-    return apply_filters( 'embed_dailymotion', '<object width="' . esc_attr($width) . '" height="' . esc_attr($height) . '" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"><param name="movie" value="http://www.dailymotion.com/swf/' . esc_attr($matches[3]) . '&amp;related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><embed src="http://www.dailymotion.com/swf/' . esc_attr($matches[3]) . '&amp;related=0" type="application/x-shockwave-flash" width="' . esc_attr($width) . '" height="' . esc_attr($height) . '" allowFullScreen="true" allowScriptAccess="always"></embed></object>', $matches, $attr, $url, $rawattr );;
-}
-wp_embed_register_handler( 'dailymotion', '#http://(www.dailymotion|dailymotion)\.com/(.+)/([0-9a-zA-Z]+)\_(.*?)#i', 'wp_embed_handler_dailymotion' );
+?>