diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index cee1a1568..41794e024 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -40,14 +40,15 @@ class WP_oEmbed { '#http://(www\.)?youtube.com/watch.*#i' => array( 'http://www.youtube.com/oembed', true ), '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 ), ) ); @@ -265,3 +266,5 @@ function &_wp_oembed_get_object() { return $wp_oembed; } + +?> \ No newline at end of file diff --git a/wp-includes/default-embeds.php b/wp-includes/default-embeds.php index 55d0fb4cb..d0a2336d2 100644 --- a/wp-includes/default-embeds.php +++ b/wp-includes/default-embeds.php @@ -49,27 +49,4 @@ function wp_embed_handler_polldaddy( $matches, $attr, $url, $rawattr ) { } 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', '', $matches, $attr, $url, $rawattr );; -} -wp_embed_register_handler( 'dailymotion', '#http://(www.dailymotion|dailymotion)\.com/(.+)/([0-9a-zA-Z]+)\_(.*?)#i', 'wp_embed_handler_dailymotion' ); +?> \ No newline at end of file