Changeset 17751

Timestamp:

04/28/2011 05:03:23 PM (14 years ago)

Author:

nacin

Message:

Remove default-embeds.php. fixes #17112.

Location:

trunk/wp-includes

Files:

• default-embeds.php (deleted)
• functions.php (modified) (1 diff)
• media.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -3198 +3198 @@
 
 /**
- * Determines if default embed handlers should be loaded.
- *
- * Checks to make sure that the embeds library hasn't already been loaded. If
- * it hasn't, then it will load the embeds library.
- *
- * @since 2.9.0
- */
-function wp_maybe_load_embeds() {
-    if ( ! apply_filters('load_default_embeds', true) )
-        return;
-    require_once( ABSPATH . WPINC . '/default-embeds.php' );
-}
-
-/**
  * Determines if Widgets library should be loaded.
  *

trunk/wp-includes/media.php

@@ -1400 +1400 @@
     $oembed->providers[$format] = array( $provider, $regex );
 }
+
+/**
+ * Determines if default embed handlers should be loaded.
+ *
+ * Checks to make sure that the embeds library hasn't already been loaded. If
+ * it hasn't, then it will load the embeds library.
+ *
+ * @since 2.9.0
+ */
+function wp_maybe_load_embeds() {
+    if ( ! apply_filters( 'load_default_embeds', true ) )
+        return;
+    wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
+}
+
+/**
+ * The Google Video embed handler callback. Google Video 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_googlevideo( $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_googlevideo', '<embed type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docid=' . esc_attr($matches[2]) . '&amp;hl=en&amp;fs=true" style="width:' . esc_attr($width) . 'px;height:' . esc_attr($height) . 'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr );
+}
+
+?>