");
+ ";
+ $size_class = sanitize_html_class( $size );
+ $gallery_div = "
";
+ $output = apply_filters( 'gallery_style', $gallery_style . "\n\t\t" . $gallery_div );
$i = 0;
foreach ( $attachments as $id => $attachment ) {
@@ -852,7 +863,7 @@ function gallery_shortcode($attr) {
";
if ( $captiontag && trim($attachment->post_excerpt) ) {
$output .= "
- <{$captiontag} class='gallery-caption'>
+ <{$captiontag} class='wp-caption-text gallery-caption'>
" . wptexturize($attachment->post_excerpt) . "
";
}
@@ -899,7 +910,7 @@ function next_image_link($size = 'thumbnail', $text = false) {
*
* @since 2.5.0
*
- * @param bool $prev Optional. Default is true to display previous link, true for next.
+ * @param bool $prev Optional. Default is true to display previous link, false for next.
*/
function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
global $post;
@@ -960,7 +971,7 @@ function get_attachment_taxonomies($attachment) {
*
* @since 2.9.0
*
- * @param $mime_type string
+ * @param string $mime_type
* @return bool
*/
function gd_edit_image_support($mime_type) {
@@ -991,8 +1002,8 @@ function gd_edit_image_support($mime_type) {
*
* @since 2.9.0
*
- * @param $width
- * @param $height
+ * @param int $width Image width
+ * @param int $height Image height
* @return image resource
*/
function wp_imagecreatetruecolor($width, $height) {
@@ -1018,14 +1029,7 @@ class WP_Embed {
var $linkifunknown = true;
/**
- * PHP4 constructor
- */
- function WP_Embed() {
- return $this->__construct();
- }
-
- /**
- * PHP5 constructor
+ * Constructor
*/
function __construct() {
// Hack to get the [embed] shortcode to run before wpautop()
@@ -1063,7 +1067,7 @@ class WP_Embed {
function run_shortcode( $content ) {
global $shortcode_tags;
- // Backup current registered shortcodes and clear them all out
+ // Back up current registered shortcodes and clear them all out
$orig_shortcode_tags = $shortcode_tags;
remove_all_shortcodes();
@@ -1079,7 +1083,7 @@ class WP_Embed {
}
/**
- * If a post/page was saved, then output Javascript to make
+ * If a post/page was saved, then output JavaScript to make
* an AJAX request that will call WP_Embed::cache_oembed().
*/
function maybe_run_ajax_cache() {
@@ -1144,7 +1148,7 @@ class WP_Embed {
* @uses update_post_meta()
*
* @param array $attr Shortcode attributes.
- * @param string $url The URL attempting to be embeded.
+ * @param string $url The URL attempting to be embedded.
* @return string The embed HTML on success, otherwise the original URL.
*/
function shortcode( $attr, $url = '' ) {
@@ -1156,6 +1160,10 @@ class WP_Embed {
$rawattr = $attr;
$attr = wp_parse_args( $attr, wp_embed_defaults() );
+ // kses converts & into & and we need to undo this
+ // See http://core.trac.wordpress.org/ticket/11311
+ $url = str_replace( '&', '&', $url );
+
// Look for known internal handlers
ksort( $this->handlers );
foreach ( $this->handlers as $priority => $handlers ) {
@@ -1184,7 +1192,7 @@ class WP_Embed {
return $this->maybe_make_link( $url );
if ( !empty($cache) )
- return apply_filters( 'embed_oembed_html', $cache, $url, $attr );
+ return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
}
// Use oEmbed to get the HTML
@@ -1197,7 +1205,7 @@ class WP_Embed {
// If there was a result, return it
if ( $html )
- return apply_filters( 'embed_oembed_html', $html, $url, $attr );
+ return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );
}
// Still unknown
@@ -1284,7 +1292,7 @@ class WP_Embed {
return apply_filters( 'embed_maybe_make_link', $output, $url );
}
}
-$wp_embed = new WP_Embed();
+$GLOBALS['wp_embed'] = new WP_Embed();
/**
* Register an embed handler. This function should probably only be used for sites that do not support oEmbed.
@@ -1368,8 +1376,8 @@ function wp_expand_dimensions( $example_width, $example_height, $max_width, $max
* @uses _wp_oembed_get_object()
* @uses WP_oEmbed::get_html()
*
- * @param string $url The URL that should be embeded.
- * @param array $args Addtional arguments and parameters.
+ * @param string $url The URL that should be embedded.
+ * @param array $args Additional arguments and parameters.
* @return string The original URL on failure or the embed HTML on success.
*/
function wp_oembed_get( $url, $args = '' ) {
@@ -1395,3 +1403,43 @@ function wp_oembed_add_provider( $format, $provider, $regex = false ) {
$oembed = _wp_oembed_get_object();
$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', '', $matches, $attr, $url, $rawattr );
+}
+
+?>
\ No newline at end of file