diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index ae1dce5e1e..0949f0bfe2 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -3740,3 +3740,20 @@ function popuplinks( $text ) { $text = preg_replace('//i', "", $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 ''; +} diff --git a/wp-includes/embed.php b/wp-includes/embed.php index 483ca3beef..816f55d442 100644 --- a/wp-includes/embed.php +++ b/wp-includes/embed.php @@ -175,8 +175,6 @@ function wp_maybe_load_embeds() { 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. * @@ -196,43 +194,6 @@ function wp_maybe_load_embeds() { wp_embed_register_handler( 'video', '#^https?://.+?\.(' . join( '|', wp_get_video_extensions() ) . ')$#i', apply_filters( 'wp_video_embed_handler', 'wp_embed_handler_video' ), 9999 ); } -/** - * 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', '', $matches, $attr, $url, $rawattr ); -} - /** * YouTube iframe embed handler callback. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 6ee579cfc2..73d59ef0bc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37743'; +$wp_version = '4.6-alpha-37744'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.