Ticket #36304: 36304.diff

src/wp-includes/deprecated.php

@@ -3740 +3740 @@
         $text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
         return $text;
 }
+
+/**
+ * The Google Video embed handler callback.
+ *
+ * Deprecated function that previously assisted in turning Google Video URLs
+ * into embeds but that service has since been shut down.
+ *
+ * @since 2.9.0
+ * @deprecated 4.6.0
+ *
+ * @return string An empty string.
+ */
+function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
+        _deprecated_function( __FUNCTION__, '4.6.0' );
+
+        return '';
+}

src/wp-includes/embed.php

@@ -175 +175 @@
 
         wp_embed_register_handler( 'youtube_embed_url', '#https?://(www.)?youtube\.com/(?:v|embed)/([^/]+)#i', 'wp_embed_handler_youtube' );
 
-        wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
-
         /**
          * Filters the audio embed handler callback.
          *
@@ -197 +195 @@
 }
 
 /**
- * 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 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'] );
-        }
-
-        /**
-         * Filters the Google Video embed output.
-         *
-         * @since 2.9.0
-         *
-         * @param string $html    Google Video HTML embed markup.
-         * @param array  $matches The RegEx matches from the provided regex.
-         * @param array  $attr    An array of embed attributes.
-         * @param string $url     The original URL that was matched by the regex.
-         * @param array  $rawattr The original unmodified attributes.
-         */
-        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 );
-}
-
-/**
  * YouTube iframe embed handler callback.
  *
  * Catches YouTube iframe embed URLs that are not parsable by oEmbed but can be translated into a URL that is.