Changeset 12027

Timestamp:

10/13/2009 10:36:24 PM (15 years ago)

Author:

ryan

Message:

Use oEmbed for youtube. Props Viper007Bond. see #10337

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (1 diff)
• class-oembed.php (modified) (1 diff)
• default-embeds.php (modified) (1 diff)
• formatting.php (modified) (2 diffs)
• media.php (modified) (6 diffs)

trunk/wp-includes/capabilities.php

@@ -963 +963 @@
  * Whether author of supplied post has capability or role.
  *
- * @since 2.9
+ * @since 2.9.0
  *
  * @param int|object $post Post ID or post object.

trunk/wp-includes/class-oembed.php

@@ -38 +38 @@
         // so only providers in this array will be used for them.
         $this->providers = apply_filters( 'oembed_providers', array(
+            'http://*.youtube.com/watch*' => 'http://www.youtube.com/oembed',
+            'http://youtube.com/watch*'   => 'http://www.youtube.com/oembed',
             'http://blip.tv/file/*'       => 'http://blip.tv/oembed/',
             'http://*.flickr.com/*'       => 'http://www.flickr.com/services/oembed/',
+            'http://www.hulu.com/watch/*' => 'http://www.hulu.com/api/oembed.{format}',
             'http://*.viddler.com/*'      => 'http://lab.viddler.com/services/oembed/',
             'http://qik.com/*'            => 'http://qik.com/api/oembed.{format}',
             'http://*.revision3.com/*'    => 'http://revision3.com/api/oembed/',
-            'http://www.hulu.com/watch/*' => 'http://www.hulu.com/api/oembed.{format}',
 
             // Vimeo uses the discovery <link>, so leave this commented to use it as a discovery test

trunk/wp-includes/default-embeds.php

@@ -7 +7 @@
  * @subpackage Embeds
  */
-
-/**
- * The YouTube.com embed handler callback. YouTube does not support oEmbed and we want to provide extra customization.
- *
- * @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_youtube( $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( 425, 344, $attr['width'], $attr['height'] );
-    }
-
-    return apply_filters( 'embed_youtube', '<object width="' . esc_attr($width) . '" height="' . esc_attr($height) . '"><param name="movie" value="http://www.youtube.com/v/' . esc_attr($matches[3]) . '&amp;hl=en&amp;fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/' . esc_attr($matches[3]) . '&amp;hl=en&amp;fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="' . esc_attr($width) . '" height="' . esc_attr($height) . '"></embed></object>', $matches, $attr, $url, $rawattr );
-}
-wp_embed_register_handler( 'youtube', '#http://(www.youtube|youtube|[A-Za-z]{2}.youtube)\.com/(watch\?v=|w/\?v=|\?v=)([\w-]+)(.*?)#i', 'wp_embed_handler_youtube' );
-
 
 /**

trunk/wp-includes/formatting.php

@@ -2359 +2359 @@
         case 'large_size_w':
         case 'large_size_h':
-        //case 'embed_size_w':
         case 'embed_size_h':
         case 'default_post_edit_rows':
@@ -2376 +2375 @@
             break;
 
+        case 'embed_size_w':
+            if ( '' !== $value )
+                $value = absint( $value );
+            break;
+
         case 'posts_per_page':
         case 'posts_per_rss':

trunk/wp-includes/media.php

@@ -1135 +1135 @@
  * Register an embed handler. This function should probably only be used for sites that do not support oEmbed.
  *
+ * @since 2.9.0
  * @see WP_Embed::register_handler()
  */
@@ -1145 +1146 @@
  * Unregister a previously registered embed handler.
  *
+ * @since 2.9.0
  * @see WP_Embed::unregister_handler()
  */
@@ -1154 +1156 @@
 /**
  * Create default array of embed parameters.
+ *
+ * @since 2.9.0
  *
  * @return array Default embed parameters.
@@ -1178 +1182 @@
  * Based on a supplied width/height example, return the biggest possible dimensions based on the max width/height.
  *
+ * @since 2.9.0
  * @uses wp_constrain_dimensions() This function passes the widths and the heights.
  *
@@ -1198 +1203 @@
  * Attempts to fetch the embed HTML for a provided URL using oEmbed.
  *
+ * @since 2.9.0
  * @see WP_oEmbed
  *
@@ -1212 +1218 @@
     return $oembed->get_html( $url, $args );
 }
+
+/**
+ * Adds a URL format and oEmbed provider URL pair.
+ *
+ * @since 2.9.0
+ * @see WP_oEmbed
+ *
+ * @uses _wp_oembed_get_object()
+ *
+ * @param string $format The format of URL that this provider can handle. Use asterisks as wildcards.
+ * @param string $provider The URL to the oEmbed provider.
+ */
+function wp_oembed_add_provider( $format, $provider ) {
+    require_once( 'class-oembed.php' );
+    $oembed = _wp_oembed_get_object();
+    $oembed->providers[$format] = $provider;
+}