Remove default-embeds.php. fixes #17112.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9fc2cddeea
commit
59446cff1d
|
@ -1,35 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default Embed Handlers
|
|
||||||
*
|
|
||||||
* @package WordPress
|
|
||||||
* @subpackage Embeds
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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]) . '&hl=en&fs=true" style="width:' . esc_attr($width) . 'px;height:' . esc_attr($height) . 'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr );
|
|
||||||
}
|
|
||||||
wp_embed_register_handler( 'googlevideo', '#http://video\.google\.([A-Za-z.]{2,5})/videoplay\?docid=([\d-]+)(.*?)#i', 'wp_embed_handler_googlevideo' );
|
|
||||||
|
|
||||||
?>
|
|
|
@ -3196,20 +3196,6 @@ function wp_list_pluck( $list, $field ) {
|
||||||
return $list;
|
return $list;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 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.
|
* Determines if Widgets library should be loaded.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1398,4 +1398,44 @@ function wp_oembed_add_provider( $format, $provider, $regex = false ) {
|
||||||
require_once( ABSPATH . WPINC . '/class-oembed.php' );
|
require_once( ABSPATH . WPINC . '/class-oembed.php' );
|
||||||
$oembed = _wp_oembed_get_object();
|
$oembed = _wp_oembed_get_object();
|
||||||
$oembed->providers[$format] = array( $provider, $regex );
|
$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]) . '&hl=en&fs=true" style="width:' . esc_attr($width) . 'px;height:' . esc_attr($height) . 'px" allowFullScreen="true" allowScriptAccess="always" />', $matches, $attr, $url, $rawattr );
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
Loading…
Reference in New Issue