";
/**
@@ -1040,26 +1050,28 @@ function gallery_shortcode( $attr ) {
*
* @since 2.5.0
*
- * @param string $gallery_style Default gallery shortcode CSS styles.
- * @param string $gallery_div Opening HTML div container for the gallery shortcode output.
+ * @param string $gallery_style Default CSS styles and opening HTML div container
+ * for the gallery shortcode output.
*/
$output = apply_filters( 'gallery_style', $gallery_style . $gallery_div );
$i = 0;
foreach ( $attachments as $id => $attachment ) {
- if ( ! empty( $link ) && 'file' === $link )
- $image_output = wp_get_attachment_link( $id, $size, false, false );
- elseif ( ! empty( $link ) && 'none' === $link )
- $image_output = wp_get_attachment_image( $id, $size, false );
- else
- $image_output = wp_get_attachment_link( $id, $size, true, false );
+ $attr = ( trim( $attachment->post_excerpt ) ) ? array( 'aria-describedby' => "$selector-$id" ) : '';
+ if ( ! empty( $atts['link'] ) && 'file' === $atts['link'] ) {
+ $image_output = wp_get_attachment_link( $id, $atts['size'], false, false, false, $attr );
+ } elseif ( ! empty( $atts['link'] ) && 'none' === $atts['link'] ) {
+ $image_output = wp_get_attachment_image( $id, $atts['size'], false, $attr );
+ } else {
+ $image_output = wp_get_attachment_link( $id, $atts['size'], true, false, false, $attr );
+ }
$image_meta = wp_get_attachment_metadata( $id );
$orientation = '';
- if ( isset( $image_meta['height'], $image_meta['width'] ) )
+ if ( isset( $image_meta['height'], $image_meta['width'] ) ) {
$orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape';
-
+ }
$output .= "<{$itemtag} class='gallery-item'>";
$output .= "
<{$icontag} class='gallery-icon {$orientation}'>
@@ -1067,7 +1079,7 @@ function gallery_shortcode( $attr ) {
";
if ( $captiontag && trim($attachment->post_excerpt) ) {
$output .= "
- <{$captiontag} class='wp-caption-text gallery-caption'>
+ <{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'>
" . wptexturize($attachment->post_excerpt) . "
";
}
@@ -1152,7 +1164,30 @@ add_action( 'wp_playlist_scripts', 'wp_playlist_scripts' );
*
* @since 3.9.0
*
- * @param array $attr Playlist shortcode attributes.
+ * @param array $attr {
+ * Array of default playlist attributes.
+ *
+ * @type string $type Type of playlist to display. Accepts 'audio' or 'video'. Default 'audio'.
+ * @type string $order Designates ascending or descending order of items in the playlist.
+ * Accepts 'ASC', 'DESC'. Default 'ASC'.
+ * @type string $orderby Any column, or columns, to sort the playlist. If $ids are
+ * passed, this defaults to the order of the $ids array ('post__in').
+ * Otherwise default is 'menu_order ID'.
+ * @type int $id If an explicit $ids array is not present, this parameter
+ * will determine which attachments are used for the playlist.
+ * Default is the current post ID.
+ * @type array $ids Create a playlist out of these explicit attachment IDs. If empty,
+ * a playlist will be created from all $type attachments of $id.
+ * Default empty.
+ * @type array $exclude List of specific attachment IDs to exclude from the playlist. Default empty.
+ * @type string $style Playlist style to use. Accepts 'light' or 'dark'. Default 'light'.
+ * @type bool $tracklist Whether to show or hide the playlist. Default true.
+ * @type bool $tracknumbers Whether to show or hide the numbers next to entries in the playlist. Default true.
+ * @type bool $images Show or hide the video or audio thumbnail (Featured Image/post
+ * thumbnail). Default true.
+ * @type bool $artists Whether to show or hide artist name in the playlist. Default true.
+ * }
+ *
* @return string Playlist output. Empty string if the passed type is unsupported.
*/
function wp_playlist_shortcode( $attr ) {
@@ -1186,17 +1221,7 @@ function wp_playlist_shortcode( $attr ) {
return $output;
}
- /*
- * We're trusting author input, so let's at least make sure it looks
- * like a valid orderby statement.
- */
- if ( isset( $attr['orderby'] ) ) {
- $attr['orderby'] = sanitize_sql_orderby( $attr['orderby'] );
- if ( ! $attr['orderby'] )
- unset( $attr['orderby'] );
- }
-
- extract( shortcode_atts( array(
+ $atts = shortcode_atts( array(
'type' => 'audio',
'order' => 'ASC',
'orderby' => 'menu_order ID',
@@ -1208,32 +1233,33 @@ function wp_playlist_shortcode( $attr ) {
'tracknumbers' => true,
'images' => true,
'artists' => true
- ), $attr, 'playlist' ) );
+ ), $attr, 'playlist' );
+
+ $id = intval( $atts['id'] );
- $id = intval( $id );
- if ( 'RAND' == $order ) {
- $orderby = 'none';
+ if ( $atts['type'] !== 'audio' ) {
+ $atts['type'] = 'video';
}
$args = array(
'post_status' => 'inherit',
'post_type' => 'attachment',
- 'post_mime_type' => $type,
- 'order' => $order,
- 'orderby' => $orderby
+ 'post_mime_type' => $atts['type'],
+ 'order' => $atts['order'],
+ 'orderby' => $atts['orderby']
);
- if ( ! empty( $include ) ) {
- $args['include'] = $include;
+ if ( ! empty( $atts['include'] ) ) {
+ $args['include'] = $atts['include'];
$_attachments = get_posts( $args );
$attachments = array();
foreach ( $_attachments as $key => $val ) {
$attachments[$val->ID] = $_attachments[$key];
}
- } elseif ( ! empty( $exclude ) ) {
+ } elseif ( ! empty( $atts['exclude'] ) ) {
$args['post_parent'] = $id;
- $args['exclude'] = $exclude;
+ $args['exclude'] = $atts['exclude'];
$attachments = get_children( $args );
} else {
$args['post_parent'] = $id;
@@ -1260,12 +1286,14 @@ function wp_playlist_shortcode( $attr ) {
$theme_width = empty( $content_width ) ? $default_width : ( $content_width - $outer );
$theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width );
- $data = compact( 'type' );
-
- // don't pass strings to JSON, will be truthy in JS
- foreach ( array( 'tracklist', 'tracknumbers', 'images', 'artists' ) as $key ) {
- $data[$key] = filter_var( $$key, FILTER_VALIDATE_BOOLEAN );
- }
+ $data = array(
+ 'type' => $atts['type'],
+ // don't pass strings to JSON, will be truthy in JS
+ 'tracklist' => wp_validate_boolean( $atts['tracklist'] ),
+ 'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ),
+ 'images' => wp_validate_boolean( $atts['images'] ),
+ 'artists' => wp_validate_boolean( $atts['artists'] ),
+ );
$tracks = array();
foreach ( $attachments as $attachment ) {
@@ -1289,7 +1317,7 @@ function wp_playlist_shortcode( $attr ) {
}
}
- if ( 'video' === $type ) {
+ if ( 'video' === $atts['type'] ) {
if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
$width = $meta['width'];
$height = $meta['height'];
@@ -1309,12 +1337,12 @@ function wp_playlist_shortcode( $attr ) {
}
}
- if ( $images ) {
- $id = get_post_thumbnail_id( $attachment->ID );
- if ( ! empty( $id ) ) {
- list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'full' );
+ if ( $atts['images'] ) {
+ $thumb_id = get_post_thumbnail_id( $attachment->ID );
+ if ( ! empty( $thumb_id ) ) {
+ list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'full' );
$track['image'] = compact( 'src', 'width', 'height' );
- list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'thumbnail' );
+ list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'thumbnail' );
$track['thumb'] = compact( 'src', 'width', 'height' );
} else {
$src = wp_mime_type_icon( $attachment->ID );
@@ -1329,8 +1357,8 @@ function wp_playlist_shortcode( $attr ) {
}
$data['tracks'] = $tracks;
- $safe_type = esc_attr( $type );
- $safe_style = esc_attr( $style );
+ $safe_type = esc_attr( $atts['type'] );
+ $safe_style = esc_attr( $atts['style'] );
ob_start();
@@ -1343,16 +1371,18 @@ function wp_playlist_shortcode( $attr ) {
* @param string $type Type of playlist. Possible values are 'audio' or 'video'.
* @param string $style The 'theme' for the playlist. Core provides 'light' and 'dark'.
*/
- do_action( 'wp_playlist_scripts', $type, $style );
+ do_action( 'wp_playlist_scripts', $atts['type'], $atts['style'] );
} ?>
-
+
< controls="controls" preload="none" width="">>
@@ -1363,7 +1393,7 @@ function wp_playlist_shortcode( $attr ) {
}
?>
-
+
'',
'preload' => 'none'
);
- foreach ( $default_types as $type )
+ foreach ( $default_types as $type ) {
$defaults_atts[$type] = '';
+ }
$atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
- extract( $atts );
$primary = false;
- if ( ! empty( $src ) ) {
- $type = wp_check_filetype( $src, wp_get_mime_types() );
- if ( ! in_array( strtolower( $type['ext'] ), $default_types ) )
- return sprintf( '
%s', esc_url( $src ), esc_html( $src ) );
+ if ( ! empty( $atts['src'] ) ) {
+ $type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
+ if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
+ return sprintf( '
%s', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
+ }
$primary = true;
array_unshift( $default_types, 'src' );
} else {
foreach ( $default_types as $ext ) {
- if ( ! empty( $$ext ) ) {
- $type = wp_check_filetype( $$ext, wp_get_mime_types() );
- if ( strtolower( $type['ext'] ) === $ext )
+ if ( ! empty( $atts[ $ext ] ) ) {
+ $type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
+ if ( strtolower( $type['ext'] ) === $ext ) {
$primary = true;
+ }
}
}
}
if ( ! $primary ) {
$audios = get_attached_media( 'audio', $post_id );
- if ( empty( $audios ) )
+ if ( empty( $audios ) ) {
return;
+ }
$audio = reset( $audios );
- $src = wp_get_attachment_url( $audio->ID );
- if ( empty( $src ) )
+ $atts['src'] = wp_get_attachment_url( $audio->ID );
+ if ( empty( $atts['src'] ) ) {
return;
+ }
array_unshift( $default_types, 'src' );
}
@@ -1549,45 +1587,49 @@ function wp_audio_shortcode( $attr, $content = '' ) {
*
* @param string $class CSS class or list of space-separated classes.
*/
- $atts = array(
+ $html_atts = array(
'class' => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
'id' => sprintf( 'audio-%d-%d', $post_id, $instances ),
- 'loop' => $loop,
- 'autoplay' => $autoplay,
- 'preload' => $preload,
- 'style' => 'width: 100%',
+ 'loop' => wp_validate_boolean( $atts['loop'] ),
+ 'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+ 'preload' => $atts['preload'],
+ 'style' => 'width: 100%; visibility: hidden;',
);
// These ones should just be omitted altogether if they are blank
foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {
- if ( empty( $atts[$a] ) )
- unset( $atts[$a] );
+ if ( empty( $html_atts[$a] ) ) {
+ unset( $html_atts[$a] );
+ }
}
$attr_strings = array();
- foreach ( $atts as $k => $v ) {
+ foreach ( $html_atts as $k => $v ) {
$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
}
$html = '';
- if ( 'mediaelement' === $library && 1 === $instances )
+ if ( 'mediaelement' === $library && 1 === $instances ) {
$html .= "\n";
+ }
$html .= sprintf( '
';
/**
@@ -1672,9 +1714,10 @@ function wp_video_shortcode( $attr, $content = '' ) {
* @param string $content Video shortcode content.
* @param int $instances Unique numeric ID of this video shortcode instance.
*/
- $html = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instances );
- if ( '' !== $html )
- return $html;
+ $override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instances );
+ if ( '' !== $override ) {
+ return $override;
+ }
$video = null;
@@ -1689,57 +1732,60 @@ function wp_video_shortcode( $attr, $content = '' ) {
'height' => 360,
);
- foreach ( $default_types as $type )
+ foreach ( $default_types as $type ) {
$defaults_atts[$type] = '';
+ }
$atts = shortcode_atts( $defaults_atts, $attr, 'video' );
- extract( $atts );
if ( is_admin() ) {
// shrink the video so it isn't huge in the admin
- if ( $width > $defaults_atts['width'] ) {
- $height = round( ( $height * $defaults_atts['width'] ) / $width );
- $width = $defaults_atts['width'];
+ if ( $atts['width'] > $defaults_atts['width'] ) {
+ $atts['height'] = round( ( $atts['height'] * $defaults_atts['width'] ) / $atts['width'] );
+ $atts['width'] = $defaults_atts['width'];
}
} else {
// if the video is bigger than the theme
- if ( ! empty( $content_width ) && $width > $content_width ) {
- $height = round( ( $height * $content_width ) / $width );
- $width = $content_width;
+ if ( ! empty( $content_width ) && $atts['width'] > $content_width ) {
+ $atts['height'] = round( ( $atts['height'] * $content_width ) / $atts['width'] );
+ $atts['width'] = $content_width;
}
}
- $yt_pattern = '#^https?://(:?www\.)?(:?youtube\.com/watch|youtu\.be/)#';
+ $yt_pattern = '#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#';
$primary = false;
- if ( ! empty( $src ) ) {
- if ( ! preg_match( $yt_pattern, $src ) ) {
- $type = wp_check_filetype( $src, wp_get_mime_types() );
+ if ( ! empty( $atts['src'] ) ) {
+ if ( ! preg_match( $yt_pattern, $atts['src'] ) ) {
+ $type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
- return sprintf( '
%s', esc_url( $src ), esc_html( $src ) );
+ return sprintf( '
%s', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
}
}
$primary = true;
array_unshift( $default_types, 'src' );
} else {
foreach ( $default_types as $ext ) {
- if ( ! empty( $$ext ) ) {
- $type = wp_check_filetype( $$ext, wp_get_mime_types() );
- if ( strtolower( $type['ext'] ) === $ext )
+ if ( ! empty( $atts[ $ext ] ) ) {
+ $type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
+ if ( strtolower( $type['ext'] ) === $ext ) {
$primary = true;
+ }
}
}
}
if ( ! $primary ) {
$videos = get_attached_media( 'video', $post_id );
- if ( empty( $videos ) )
+ if ( empty( $videos ) ) {
return;
+ }
$video = reset( $videos );
- $src = wp_get_attachment_url( $video->ID );
- if ( empty( $src ) )
+ $atts['src'] = wp_get_attachment_url( $video->ID );
+ if ( empty( $atts['src'] ) ) {
return;
+ }
array_unshift( $default_types, 'src' );
}
@@ -1764,75 +1810,82 @@ function wp_video_shortcode( $attr, $content = '' ) {
*
* @param string $class CSS class or list of space-separated classes.
*/
- $atts = array(
+ $html_atts = array(
'class' => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
'id' => sprintf( 'video-%d-%d', $post_id, $instances ),
- 'width' => absint( $width ),
- 'height' => absint( $height ),
- 'poster' => esc_url( $poster ),
- 'loop' => $loop,
- 'autoplay' => $autoplay,
- 'preload' => $preload,
+ 'width' => absint( $atts['width'] ),
+ 'height' => absint( $atts['height'] ),
+ 'poster' => esc_url( $atts['poster'] ),
+ 'loop' => wp_validate_boolean( $atts['loop'] ),
+ 'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+ 'preload' => $atts['preload'],
);
// These ones should just be omitted altogether if they are blank
foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {
- if ( empty( $atts[$a] ) )
- unset( $atts[$a] );
+ if ( empty( $html_atts[$a] ) ) {
+ unset( $html_atts[$a] );
+ }
}
$attr_strings = array();
- foreach ( $atts as $k => $v ) {
+ foreach ( $html_atts as $k => $v ) {
$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
}
$html = '';
- if ( 'mediaelement' === $library && 1 === $instances )
+ if ( 'mediaelement' === $library && 1 === $instances ) {
$html .= "\n";
+ }
$html .= sprintf( '
';
- $html = sprintf( '
%s
', $width, $html );
+ $width_rule = '';
+ if ( ! empty( $atts['width'] ) ) {
+ $width_rule = sprintf( 'width: %dpx; ', $atts['width'] );
+ }
+ $output = sprintf( '
%s
', $width_rule, $html );
/**
* Filter the output of the video shortcode.
*
* @since 3.6.0
*
- * @param string $html Video shortcode HTML output.
+ * @param string $output Video shortcode HTML output.
* @param array $atts Array of video shortcode attributes.
* @param string $video Video file.
* @param int $post_id Post ID.
* @param string $library Media library used for the video shortcode.
*/
- return apply_filters( 'wp_video_shortcode', $html, $atts, $video, $post_id, $library );
+ return apply_filters( 'wp_video_shortcode', $output, $atts, $video, $post_id, $library );
}
add_shortcode( 'video', 'wp_video_shortcode' );
@@ -1873,16 +1926,22 @@ function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
$post = get_post();
$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
- foreach ( $attachments as $k => $attachment )
- if ( $attachment->ID == $post->ID )
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID ) {
break;
+ }
+ }
+
+ $output = '';
+ $attachment_id = 0;
- $k = $prev ? $k - 1 : $k + 1;
+ if ( $attachments ) {
+ $k = $prev ? $k - 1 : $k + 1;
- $output = $attachment_id = null;
- if ( isset( $attachments[ $k ] ) ) {
- $attachment_id = $attachments[ $k ]->ID;
- $output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+ if ( isset( $attachments[ $k ] ) ) {
+ $attachment_id = $attachments[ $k ]->ID;
+ $output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+ }
}
$adjacent = $prev ? 'previous' : 'next';
@@ -1890,7 +1949,7 @@ function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
/**
* Filter the adjacent image link.
*
- * The dynamic portion of the hook name, $adjacent, refers to the type of adjacency,
+ * The dynamic portion of the hook name, `$adjacent`, refers to the type of adjacency,
* either 'next', or 'previous'.
*
* @since 3.5.0
@@ -1949,7 +2008,6 @@ function get_attachment_taxonomies($attachment) {
*
* @since 3.5.0
* @see get_attachment_taxonomies()
- * @uses get_taxonomies()
*
* @param string $output The type of output to return, either taxonomy 'names' or 'objects'. 'names' is the default.
* @return array The names of all taxonomy of $object_type.
@@ -1979,7 +2037,7 @@ function get_taxonomies_for_attachments( $output = 'names' ) {
*
* @param int $width Image width
* @param int $height Image height
- * @return image resource
+ * @return resource resource
*/
function wp_imagecreatetruecolor($width, $height) {
$img = imagecreatetruecolor($width, $height);
@@ -1995,6 +2053,12 @@ function wp_imagecreatetruecolor($width, $height) {
*
* @since 2.9.0
* @see WP_Embed::register_handler()
+ *
+ * @global WP_Embed $wp_embed
+ * @param string $id
+ * @param string $regex
+ * @param callable $callback
+ * @param int $priority
*/
function wp_embed_register_handler( $id, $regex, $callback, $priority = 10 ) {
global $wp_embed;
@@ -2006,6 +2070,10 @@ function wp_embed_register_handler( $id, $regex, $callback, $priority = 10 ) {
*
* @since 2.9.0
* @see WP_Embed::unregister_handler()
+ *
+ * @global WP_Embed $wp_embed
+ * @param string $id
+ * @param int $priority
*/
function wp_embed_unregister_handler( $id, $priority = 10 ) {
global $wp_embed;
@@ -2024,9 +2092,11 @@ function wp_embed_unregister_handler( $id, $priority = 10 ) {
*
* @since 2.9.0
*
+ * @param string $url Optional. The URL that should be embedded. Default empty.
+ *
* @return array Default embed parameters.
*/
-function wp_embed_defaults() {
+function wp_embed_defaults( $url = '' ) {
if ( ! empty( $GLOBALS['content_width'] ) )
$width = (int) $GLOBALS['content_width'];
@@ -2040,17 +2110,17 @@ function wp_embed_defaults() {
*
* @since 2.9.0
*
- * @param int $width Width of the embed in pixels.
- * @param int $height Height of the embed in pixels.
+ * @param int $width Width of the embed in pixels.
+ * @param int $height Height of the embed in pixels.
+ * @param string $url The URL that should be embedded.
*/
- return apply_filters( 'embed_defaults', compact( 'width', 'height' ) );
+ return apply_filters( 'embed_defaults', compact( 'width', 'height' ), $url );
}
/**
* Based on a supplied width/height example, return the biggest possible dimensions based on the max width/height.
*
* @since 2.9.0
- * @uses wp_constrain_dimensions() This function passes the widths and the heights.
*
* @param int $example_width The width of an example embed.
* @param int $example_height The height of an example embed.
@@ -2073,12 +2143,9 @@ function wp_expand_dimensions( $example_width, $example_height, $max_width, $max
* @since 2.9.0
* @see WP_oEmbed
*
- * @uses _wp_oembed_get_object()
- * @uses WP_oEmbed::get_html()
- *
* @param string $url The URL that should be embedded.
* @param array $args Additional arguments and parameters.
- * @return bool|string False on failure or the embed HTML on success.
+ * @return false|string False on failure or the embed HTML on success.
*/
function wp_oembed_get( $url, $args = '' ) {
require_once( ABSPATH . WPINC . '/class-oembed.php' );
@@ -2092,16 +2159,19 @@ function wp_oembed_get( $url, $args = '' ) {
* @since 2.9.0
* @see WP_oEmbed
*
- * @uses _wp_oembed_get_object()
- *
* @param string $format The format of URL that this provider can handle. You can use asterisks as wildcards.
* @param string $provider The URL to the oEmbed provider.
* @param boolean $regex Whether the $format parameter is in a regex format.
*/
function wp_oembed_add_provider( $format, $provider, $regex = false ) {
require_once( ABSPATH . WPINC . '/class-oembed.php' );
- $oembed = _wp_oembed_get_object();
- $oembed->providers[$format] = array( $provider, $regex );
+
+ if ( did_action( 'plugins_loaded' ) ) {
+ $oembed = _wp_oembed_get_object();
+ $oembed->providers[$format] = array( $provider, $regex );
+ } else {
+ WP_oEmbed::_add_provider_early( $format, $provider, $regex );
+ }
}
/**
@@ -2110,18 +2180,20 @@ function wp_oembed_add_provider( $format, $provider, $regex = false ) {
* @since 3.5.0
* @see WP_oEmbed
*
- * @uses _wp_oembed_get_object()
- *
* @param string $format The URL format for the oEmbed provider to remove.
*/
function wp_oembed_remove_provider( $format ) {
require_once( ABSPATH . WPINC . '/class-oembed.php' );
- $oembed = _wp_oembed_get_object();
+ if ( did_action( 'plugins_loaded' ) ) {
+ $oembed = _wp_oembed_get_object();
- if ( isset( $oembed->providers[ $format ] ) ) {
- unset( $oembed->providers[ $format ] );
- return true;
+ if ( isset( $oembed->providers[ $format ] ) ) {
+ unset( $oembed->providers[ $format ] );
+ return true;
+ }
+ } else {
+ WP_oEmbed::_remove_provider_early( $format );
}
return false;
@@ -2149,6 +2221,8 @@ function wp_maybe_load_embeds() {
return;
}
+ wp_embed_register_handler( 'youtube_embed_url', '#https?://(www.)?youtube\.com/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' );
/**
@@ -2205,6 +2279,38 @@ function wp_embed_handler_googlevideo( $matches, $attr, $url, $rawattr ) {
return apply_filters( 'embed_googlevideo', '
', $matches, $attr, $url, $rawattr );
}
+/**
+ * YouTube embed handler callback.
+ *
+ * Catches URLs that can be parsed but aren't supported by oEmbed.
+ *
+ * @since 4.0.0
+ *
+ * @param array $matches The regex matches from the provided regex when calling
+ * {@see 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_youtube( $matches, $attr, $url, $rawattr ) {
+ global $wp_embed;
+ $embed = $wp_embed->autoembed( "https://youtube.com/watch?v={$matches[2]}" );
+ /**
+ * Filter the YoutTube embed output.
+ *
+ * @since 4.0.0
+ *
+ * @see wp_embed_handler_youtube()
+ *
+ * @param string $embed YouTube embed output.
+ * @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( 'wp_embed_handler_youtube', $embed, $attr, $url, $rawattr );
+}
+
/**
* Audio embed handler callback.
*
@@ -2428,10 +2534,13 @@ function wp_plupload_default_settings() {
),
);
- // Multi-file uploading doesn't currently work in iOS Safari,
- // single-file allows the built-in camera to be used as source for images
- if ( wp_is_mobile() )
+ // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
+ // when enabled. See #29602.
+ if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+ strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+
$defaults['multi_selection'] = false;
+ }
/**
* Filter the Plupload default settings.
@@ -2466,7 +2575,7 @@ function wp_plupload_default_settings() {
'limitExceeded' => is_multisite() && ! is_upload_space_available()
);
- $script = 'var _wpPluploadSettings = ' . json_encode( $settings ) . ';';
+ $script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
if ( $data )
$script = "$data\n$script";
@@ -2526,8 +2635,33 @@ function wp_prepare_attachment_for_js( $attachment ) {
'edit' => false
),
'editLink' => false,
+ 'meta' => false,
);
+ $author = new WP_User( $attachment->post_author );
+ $response['authorName'] = $author->display_name;
+
+ if ( $attachment->post_parent ) {
+ $post_parent = get_post( $attachment->post_parent );
+ } else {
+ $post_parent = false;
+ }
+
+ if ( $post_parent ) {
+ $parent_type = get_post_type_object( $post_parent->post_type );
+ if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $attachment->post_parent ) ) {
+ $response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
+ }
+ $response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
+ }
+
+ $attached_file = get_attached_file( $attachment->ID );
+ if ( file_exists( $attached_file ) ) {
+ $bytes = filesize( $attached_file );
+ $response['filesizeInBytes'] = $bytes;
+ $response['filesizeHumanReadable'] = size_format( $bytes );
+ }
+
if ( current_user_can( 'edit_post', $attachment->ID ) ) {
$response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );
$response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );
@@ -2606,7 +2740,9 @@ function wp_prepare_attachment_for_js( $attachment ) {
$response['fileLength'] = $meta['length_formatted'];
$response['meta'] = array();
- foreach ( wp_get_attachment_id3_keys( $attachment ) as $key => $label ) {
+ foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
+ $response['meta'][ $key ] = false;
+
if ( ! empty( $meta[ $key ] ) ) {
$response['meta'][ $key ] = $meta[ $key ];
}
@@ -2654,7 +2790,7 @@ function wp_enqueue_media( $args = array() ) {
if ( did_action( 'wp_enqueue_media' ) )
return;
- global $content_width;
+ global $content_width, $wpdb, $wp_locale;
$defaults = array(
'post' => null,
@@ -2693,14 +2829,28 @@ function wp_enqueue_media( $args = array() ) {
}
}
- $audio = $video = 0;
- $counts = (array) wp_count_attachments();
- foreach ( $counts as $mime => $total ) {
- if ( 0 === strpos( $mime, 'audio/' ) ) {
- $audio += (int) $total;
- } elseif ( 0 === strpos( $mime, 'video/' ) ) {
- $video += (int) $total;
- }
+ $has_audio = $wpdb->get_var( "
+ SELECT ID
+ FROM $wpdb->posts
+ WHERE post_type = 'attachment'
+ AND post_mime_type LIKE 'audio%'
+ LIMIT 1
+ " );
+ $has_video = $wpdb->get_var( "
+ SELECT ID
+ FROM $wpdb->posts
+ WHERE post_type = 'attachment'
+ AND post_mime_type LIKE 'video%'
+ LIMIT 1
+ " );
+ $months = $wpdb->get_results( $wpdb->prepare( "
+ SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+ FROM $wpdb->posts
+ WHERE post_type = %s
+ ORDER BY post_date DESC
+ ", 'attachment' ) );
+ foreach ( $months as $month_year ) {
+ $month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
}
$settings = array(
@@ -2717,12 +2867,14 @@ function wp_enqueue_media( $args = array() ) {
),
'defaultProps' => $props,
'attachmentCounts' => array(
- 'audio' => $audio,
- 'video' => $video
+ 'audio' => ( $has_audio ) ? 1 : 0,
+ 'video' => ( $has_video ) ? 1 : 0
),
'embedExts' => $exts,
'embedMimes' => $ext_mimes,
'contentWidth' => $content_width,
+ 'months' => $months,
+ 'mediaTrash' => MEDIA_TRASH ? 1 : 0
);
$post = null;
@@ -2773,17 +2925,36 @@ function wp_enqueue_media( $args = array() ) {
'uploadImagesTitle' => __( 'Upload Images' ),
// Library
- 'mediaLibraryTitle' => __( 'Media Library' ),
- 'insertMediaTitle' => __( 'Insert Media' ),
- 'createNewGallery' => __( 'Create a new gallery' ),
- 'createNewPlaylist' => __( 'Create a new playlist' ),
- 'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
- 'returnToLibrary' => __( '← Return to library' ),
- 'allMediaItems' => __( 'All media items' ),
- 'noItemsFound' => __( 'No items found.' ),
- 'insertIntoPost' => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
- 'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
- 'warnDelete' => __( "You are about to permanently delete this item.\n 'Cancel' to stop, 'OK' to delete." ),
+ 'mediaLibraryTitle' => __( 'Media Library' ),
+ 'insertMediaTitle' => __( 'Insert Media' ),
+ 'createNewGallery' => __( 'Create a new gallery' ),
+ 'createNewPlaylist' => __( 'Create a new playlist' ),
+ 'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
+ 'returnToLibrary' => __( '← Return to library' ),
+ 'allMediaItems' => __( 'All media items' ),
+ 'allDates' => __( 'All dates' ),
+ 'noItemsFound' => __( 'No items found.' ),
+ 'insertIntoPost' => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
+ 'unattached' => __( 'Unattached' ),
+ 'trash' => _x( 'Trash', 'noun' ),
+ 'uploadedToThisPost' => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
+ 'warnDelete' => __( "You are about to permanently delete this item.\n 'Cancel' to stop, 'OK' to delete." ),
+ 'warnBulkDelete' => __( "You are about to permanently delete these items.\n 'Cancel' to stop, 'OK' to delete." ),
+ 'warnBulkTrash' => __( "You are about to trash these items.\n 'Cancel' to stop, 'OK' to delete." ),
+ 'bulkSelect' => __( 'Bulk Select' ),
+ 'cancelSelection' => __( 'Cancel Selection' ),
+ 'trashSelected' => __( 'Trash Selected' ),
+ 'untrashSelected' => __( 'Untrash Selected' ),
+ 'deleteSelected' => __( 'Delete Selected' ),
+ 'deletePermanently' => __( 'Delete Permanently' ),
+ 'apply' => __( 'Apply' ),
+ 'filterByDate' => __( 'Filter by date' ),
+ 'filterByType' => __( 'Filter by type' ),
+ 'searchMediaLabel' => __( 'Search Media' ),
+ 'noMedia' => __( 'No media attachments found.' ),
+
+ // Library Details
+ 'attachmentDetails' => __( 'Attachment Details' ),
// From URL
'insertFromUrlTitle' => __( 'Insert from URL' ),
@@ -2829,7 +3000,7 @@ function wp_enqueue_media( $args = array() ) {
'videoReplaceTitle' => __( 'Replace Video' ),
'videoAddSourceTitle' => __( 'Add Video Source' ),
'videoDetailsCancel' => __( 'Cancel Edit' ),
- 'videoSelectPosterImageTitle' => _( 'Select Poster Image' ),
+ 'videoSelectPosterImageTitle' => __( 'Select Poster Image' ),
'videoAddTrackTitle' => __( 'Add Subtitles' ),
// Playlist
@@ -2875,9 +3046,11 @@ function wp_enqueue_media( $args = array() ) {
$strings['settings'] = $settings;
+ // Ensure we enqueue media-editor first, that way media-views is
+ // registered internally before we try to localize it. see #24724.
+ wp_enqueue_script( 'media-editor' );
wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
- wp_enqueue_script( 'media-editor' );
wp_enqueue_script( 'media-audiovideo' );
wp_enqueue_style( 'media-views' );
if ( is_admin() ) {
@@ -2905,9 +3078,9 @@ function wp_enqueue_media( $args = array() ) {
*
* @since 3.6.0
*
- * @param string $type (Mime) type of media desired
- * @param mixed $post Post ID or object
- * @return array Found attachments
+ * @param string $type Mime type.
+ * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @return array Found attachments.
*/
function get_attached_media( $type, $post = 0 ) {
if ( ! $post = get_post( $post ) )
@@ -2936,7 +3109,7 @@ function get_attached_media( $type, $post = 0 ) {
$children = get_children( $args );
/**
- * Filter the
+ * Filter the list of media attached to the given post.
*
* @since 3.6.0
*
@@ -2948,7 +3121,7 @@ function get_attached_media( $type, $post = 0 ) {
}
/**
- * Check the content blob for an