enmi-conf.org: comparison wp/wp-includes/media.php

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 * WordPress API for media display.
 *
 * @package WordPress
 * @subpackage Media
 */
+/**
+* Retrieve additional image sizes.
+*
+* @since 4.7.0
+*
+* @global array $_wp_additional_image_sizes
+*
+* @return array Additional images size data.
+*/
+function wp_get_additional_image_sizes() {
+	global $_wp_additional_image_sizes;
+	if ( ! $_wp_additional_image_sizes ) {
+		$_wp_additional_image_sizes = array();
+	}
+	return $_wp_additional_image_sizes;
+}
 /**
 * Scale down the default size of an image.
 *
 * This is so that the image is a better fit for the editor and theme.
 *
 * The `$size` parameter accepts either an array or a string. The supported string
 * values are 'thumb' or 'thumbnail' for the given thumbnail size or defaults at
 * 128 width and 96 height in pixels. Also supported for the string value is
-* 'medium' and 'full'. The 'full' isn't actually supported, but any value other
+* 'medium', 'medium_large' and 'full'. The 'full' isn't actually supported, but any value other
 * than the supported will result in the content_width size or 500 if that is
 * not set.
 *
 * Finally, there is a filter named {@see 'editor_max_image_size'}, that will be
 * called on the calculated array for width and height, respectively. The second
 * type for the hook is an array with the width as the first element and the
 * height as the second element.
 *
 * @since 2.5.0
 *
+* @global int   $content_width
+*
 * @param int          $width   Width of the image in pixels.
 * @param int          $height  Height of the image in pixels.
-* @param string|array $size    Optional. Size or array of sizes of what the result image
+* @param string|array $size    Optional. Image size. Accepts any valid image size, or an array
-*                              should be. Accepts any valid image size name. Default 'medium'.
+*                              of width and height values in pixels (in that order).
+*                              Default 'medium'.
 * @param string       $context Optional. Could be 'display' (like in a theme) or 'edit'
 *                              (like inserting into an editor). Default null.
 * @return array Width and height of what the result image should resize to.
 */
 function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
-	global $content_width, $_wp_additional_image_sizes;
+	global $content_width;
+	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 	if ( ! $context )
 		$context = is_admin() ? 'edit' : 'display';
 	if ( is_array($size) ) {
 		}
 	}
 	elseif ( $size == 'medium' ) {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
-		// if no width is set, default to the theme content width if available
+	}
+	elseif ( $size == 'medium_large' ) {
+		$max_width = intval( get_option( 'medium_large_size_w' ) );
+		$max_height = intval( get_option( 'medium_large_size_h' ) );
+		if ( intval( $content_width ) > 0 ) {
+			$max_width = min( intval( $content_width ), $max_width );
+		}
 	}
 	elseif ( $size == 'large' ) {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
 		 * itself, and within the theme's content width if it's known. The user
 		 * can resize it in the editor if they wish.
 		 */
 		$max_width = intval(get_option('large_size_w'));
 		$max_height = intval(get_option('large_size_h'));
-		if ( intval($content_width) > 0 )
+		if ( intval($content_width) > 0 ) {
 			$max_width = min( intval($content_width), $max_width );
-	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
+		}
+	} elseif ( ! empty( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
 		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
 		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
+		// Only in admin. Assume that theme authors know what they're doing.
-			$max_width = min( intval($content_width), $max_width );
+		if ( intval( $content_width ) > 0 && 'edit' === $context ) {
+			$max_width = min( intval( $content_width ), $max_width );
+		}
 	}
 	// $size == 'full' has no constraint
 	else {
 		$max_width = $width;
 		$max_height = $height;
 	}
 	/**
-	 * Filter the maximum image size dimensions for the editor.
+	 * Filters the maximum image size dimensions for the editor.
 	 *
 	 * @since 2.5.0
 	 *
 	 * @param array        $max_image_size An array with the width as the first element,
 	 *                                     and the height as the second element.
 *
 * The URL might be the original image, or it might be a resized version. This
 * function won't create a new resized copy, it will just return an already
 * resized one if it exists.
 *
-* A plugin may use the 'image_downsize' filter to hook into and offer image
+* A plugin may use the {@see 'image_downsize'} filter to hook into and offer image
 * resizing services for images. The hook must return an array with the same
 * elements that are returned in the function. The first element being the URL
 * to the new image that was resized.
 *
 * @since 2.5.0
 *
 * @param int          $id   Attachment ID for image.
-* @param array|string $size Optional. Image size to scale to. Accepts a registered image size
+* @param array|string $size Optional. Image size to scale to. Accepts any valid image size,
-*                           or flat array of height and width values. Default 'medium'.
+*                           or an array of width and height values in pixels (in that order).
-* @return bool|array False on failure, array on success.
+*                           Default 'medium'.
+* @return false|array Array containing the image URL, width, height, and boolean for whether
+*                     the image is an intermediate size. False on failure.
 */
 function image_downsize( $id, $size = 'medium' ) {
+	$is_image = wp_attachment_is_image( $id );
-	if ( !wp_attachment_is_image($id) )
-		return false;
+	/**
+	 * Filters whether to preempt the output of image_downsize().
-	/**
-	 * Filter whether to preempt the output of image_downsize().
 	 *
 	 * Passing a truthy value to the filter will effectively short-circuit
 	 * down-sizing the image, returning that value as output instead.
 	 *
 	 * @since 2.5.0
 	 *
 	 * @param bool         $downsize Whether to short-circuit the image downsize. Default false.
 	 * @param int          $id       Attachment ID for image.
-	 * @param array|string $size     Size of image, either array or string. Default 'medium'.
+	 * @param array|string $size     Size of image. Image size or array of width and height values (in that order).
+	 *                               Default 'medium'.
 	 */
 	if ( $out = apply_filters( 'image_downsize', false, $id, $size ) ) {
 		return $out;
 	}
 	$img_url = wp_get_attachment_url($id);
 	$meta = wp_get_attachment_metadata($id);
 	$width = $height = 0;
 	$is_intermediate = false;
 	$img_url_basename = wp_basename($img_url);
+	// If the file isn't an image, attempt to replace its URL with a rendered image from its meta.
+	// Otherwise, a non-image type could be returned.
+	if ( ! $is_image ) {
+		if ( ! empty( $meta['sizes'] ) ) {
+			$img_url = str_replace( $img_url_basename, $meta['sizes']['full']['file'], $img_url );
+			$img_url_basename = $meta['sizes']['full']['file'];
+			$width = $meta['sizes']['full']['width'];
+			$height = $meta['sizes']['full']['height'];
+		} else {
+			return false;
+		}
+	}
 	// try for a new style intermediate size
 	if ( $intermediate = image_get_intermediate_size($id, $size) ) {
 		$img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
 		$width = $intermediate['width'];
 * @global array $_wp_additional_image_sizes Associative array of additional image sizes.
 *
 * @param string     $name   Image size identifier.
 * @param int        $width  Image width in pixels.
 * @param int        $height Image height in pixels.
-* @param bool|array $crop   Optional. Whether to crop images to specified height and width or resize.
+* @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
 *                           An array can specify positioning of the crop area. Default false.
 */
 function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
 	global $_wp_additional_image_sizes;
 *
 * @param string $name The image size to check.
 * @return bool True if the image size exists, false if not.
 */
 function has_image_size( $name ) {
-	global $_wp_additional_image_sizes;
+	$sizes = wp_get_additional_image_sizes();
+	return isset( $sizes[ $name ] );
-	return isset( $_wp_additional_image_sizes[ $name ] );
 }
 /**
 * Remove a new image size.
 *
 * @since 3.9.0
+*
+* @global array $_wp_additional_image_sizes
 *
 * @param string $name The image size to remove.
 * @return bool True if the image size was successfully removed, false on failure.
 */
 function remove_image_size( $name ) {
 *
 * @see add_image_size() for details on cropping behavior.
 *
 * @param int        $width  Image width in pixels.
 * @param int        $height Image height in pixels.
-* @param bool|array $crop   Optional. Whether to crop images to specified height and width or resize.
+* @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
 *                           An array can specify positioning of the crop area. Default false.
 */
 function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
 	add_image_size( 'post-thumbnail', $width, $height, $crop );
 }
 /**
 * Gets an img tag for an image attachment, scaling it down if requested.
 *
-* The filter 'get_image_tag_class' allows for changing the class name for the
+* The {@see 'get_image_tag_class'} filter allows for changing the class name for the
 * image without having to use regular expressions on the HTML content. The
 * parameters are: what WordPress will use for the class, the Attachment ID,
 * image align value, and the size the image should be.
 *
-* The second filter 'get_image_tag' has the HTML content, which can then be
+* The second filter, {@see 'get_image_tag'}, has the HTML content, which can then be
 * further manipulated by a plugin to change all attribute values and even HTML
 * content.
 *
 * @since 2.5.0
 *
 * @param int          $id    Attachment ID.
 * @param string       $alt   Image Description for the alt attribute.
 * @param string       $title Image Description for the title attribute.
 * @param string       $align Part of the class name for aligning the image.
-* @param string|array $size  Optional. Registered image size to retrieve a tag for, or flat array
+* @param string|array $size  Optional. Registered image size to retrieve a tag for. Accepts any
-*                            of height and width values. Default 'medium'.
+*                            valid image size, or an array of width and height values in pixels
+*                            (in that order). Default 'medium'.
 * @return string HTML IMG element for given image attachment
 */
 function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) {
 	list( $img_src, $width, $height ) = image_downsize($id, $size);
 	$title = $title ? 'title="' . esc_attr( $title ) . '" ' : '';
 	$class = 'align' . esc_attr($align) .' size-' . esc_attr($size) . ' wp-image-' . $id;
 	/**
-	 * Filter the value of the attachment's image tag class attribute.
+	 * Filters the value of the attachment's image tag class attribute.
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param string $class CSS class name or space-separated list of classes.
+	 * @param string       $class CSS class name or space-separated list of classes.
-	 * @param int    $id    Attachment ID.
+	 * @param int          $id    Attachment ID.
-	 * @param string $align Part of the class name for aligning the image.
+	 * @param string       $align Part of the class name for aligning the image.
-	 * @param string $size  Optional. Default is 'medium'.
+	 * @param string|array $size  Size of image. Image size or array of width and height values (in that order).
+	 *                            Default 'medium'.
 	 */
 	$class = apply_filters( 'get_image_tag_class', $class, $id, $align, $size );
 	$html = '<img src="' . esc_attr($img_src) . '" alt="' . esc_attr($alt) . '" ' . $title . $hwstring . 'class="' . $class . '" />';
 	/**
-	 * Filter the HTML content for the image tag.
+	 * Filters the HTML content for the image tag.
 	 *
 	 * @since 2.6.0
 	 *
-	 * @param string $html  HTML content for the image.
+	 * @param string       $html  HTML content for the image.
-	 * @param int    $id    Attachment ID.
+	 * @param int          $id    Attachment ID.
-	 * @param string $alt   Alternate text.
+	 * @param string       $alt   Alternate text.
-	 * @param string $title Attachment title.
+	 * @param string       $title Attachment title.
-	 * @param string $align Part of the class name for aligning the image.
+	 * @param string       $align Part of the class name for aligning the image.
-	 * @param string $size  Optional. Default is 'medium'.
+	 * @param string|array $size  Size of image. Image size or array of width and height values (in that order).
-	 */
+	 *                            Default 'medium'.
-	$html = apply_filters( 'get_image_tag', $html, $id, $alt, $title, $align, $size );
+	 */
+	return apply_filters( 'get_image_tag', $html, $id, $alt, $title, $align, $size );
-	return $html;
 }
 /**
 * Calculates the new dimensions for a down-sampled image.
 *
 	if ( $did_height && $h == $max_height - 1 ) {
 		$h = $max_height; // Round it up
 	}
 	/**
-	 * Filter dimensions to constrain down-sampled images to.
+	 * Filters dimensions to constrain down-sampled images to.
 	 *
 	 * @since 4.1.0
 	 *
 	 * @param array $dimensions     The image width and height.
 	 * @param int 	$current_width  The current width of the image.
 *
 * @param int        $orig_w Original width in pixels.
 * @param int        $orig_h Original height in pixels.
 * @param int        $dest_w New width in pixels.
 * @param int        $dest_h New height in pixels.
-* @param bool|array $crop   Optional. Whether to crop image to specified height and width or resize.
+* @param bool|array $crop   Optional. Whether to crop image to specified width and height or resize.
 *                           An array can specify positioning of the crop area. Default false.
-* @return bool|array False on failure. Returned array matches parameters for `imagecopyresampled()`.
+* @return false|array False on failure. Returned array matches parameters for `imagecopyresampled()`.
 */
-function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
+function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
 	if ($orig_w <= 0 || $orig_h <= 0)
 		return false;
 	// at least one of dest_w or dest_h must be specific
 	if ($dest_w <= 0 && $dest_h <= 0)
 		return false;
 	/**
-	 * Filter whether to preempt calculating the image resize dimensions.
+	 * Filters whether to preempt calculating the image resize dimensions.
 	 *
 	 * Passing a non-null value to the filter will effectively short-circuit
 	 * image_resize_dimensions(), returning that value instead.
 	 *
 	 * @since 3.4.0
 	 * @param null|mixed $null   Whether to preempt output of the resize dimensions.
 	 * @param int        $orig_w Original width in pixels.
 	 * @param int        $orig_h Original height in pixels.
 	 * @param int        $dest_w New width in pixels.
 	 * @param int        $dest_h New height in pixels.
-	 * @param bool|array $crop   Whether to crop image to specified height and width or resize.
+	 * @param bool|array $crop   Whether to crop image to specified width and height or resize.
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
 	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
 	if ( null !== $output )
 		return $output;
 /**
 * Resizes an image to make a thumbnail or intermediate size.
 *
 * The returned array has the file size, the image width, and image height. The
-* filter 'image_make_intermediate_size' can be used to hook in and change the
+* {@see 'image_make_intermediate_size'} filter can be used to hook in and change the
 * values of the returned array. The only parameter is the resized file path.
 *
 * @since 2.5.0
 *
 * @param string $file   File path.
 * @param int    $width  Image width.
 * @param int    $height Image height.
-* @param bool   $crop   Optional. Whether to crop image to specified height and width or resize.
+* @param bool   $crop   Optional. Whether to crop image to specified width and height or resize.
 *                       Default false.
-* @return bool|array False, if no image was created. Metadata array on success.
+* @return false|array False, if no image was created. Metadata array on success.
 */
 function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
 	if ( $width || $height ) {
 		$editor = wp_get_image_editor( $file );
 			unset( $resized_file['path'] );
 			return $resized_file;
 		}
 	}
 	return false;
+}
+/**
+* Helper function to test if aspect ratios for two images match.
+*
+* @since 4.6.0
+*
+* @param int $source_width  Width of the first image in pixels.
+* @param int $source_height Height of the first image in pixels.
+* @param int $target_width  Width of the second image in pixels.
+* @param int $target_height Height of the second image in pixels.
+* @return bool True if aspect ratios match within 1px. False if not.
+*/
+function wp_image_matches_ratio( $source_width, $source_height, $target_width, $target_height ) {
+	/*
+	 * To test for varying crops, we constrain the dimensions of the larger image
+	 * to the dimensions of the smaller image and see if they match.
+	 */
+	if ( $source_width > $target_width ) {
+		$constrained_size = wp_constrain_dimensions( $source_width, $source_height, $target_width );
+		$expected_size = array( $target_width, $target_height );
+	} else {
+		$constrained_size = wp_constrain_dimensions( $target_width, $target_height, $source_width );
+		$expected_size = array( $source_width, $source_height );
+	}
+	// If the image dimensions are within 1px of the expected size, we consider it a match.
+	$matched = ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 );
+	return $matched;
 }
 /**
 * Retrieves the image's intermediate size (resized) path, width, and height.
 *
 * browser scale down the image.
 *
 * @since 2.5.0
 *
 * @param int          $post_id Attachment ID.
-* @param array|string $size    Optional. Registered image size to retrieve or flat array of height
+* @param array|string $size    Optional. Image size. Accepts any valid image size, or an array
-*                              and width dimensions. Default 'thumbnail'.
+*                              of width and height values in pixels (in that order).
-* @return bool|array False on failure or array of file path, width, and height on success.
+*                              Default 'thumbnail'.
+* @return false|array $data {
+*     Array of file relative path, width, and height on success. Additionally includes absolute
+*     path and URL if registered size is passed to $size parameter. False on failure.
+*
+*     @type string $file   Image's path relative to uploads directory
+*     @type int    $width  Width of image
+*     @type int    $height Height of image
+*     @type string $path   Image's absolute filesystem path.
+*     @type string $url    Image's URL.
+* }
 */
 function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
+	if ( ! $size || ! is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) || empty( $imagedata['sizes'] )  ) {
 		return false;
+	}
-	// get the best one for a specified set of dimensions
-	if ( is_array($size) && !empty($imagedata['sizes']) ) {
+	$data = array();
-		$areas = array();
+	// Find the best match when '$size' is an array.
+	if ( is_array( $size ) ) {
+		$candidates = array();
+		if ( ! isset( $imagedata['file'] ) && isset( $imagedata['sizes']['full'] ) ) {
+			$imagedata['height'] = $imagedata['sizes']['full']['height'];
+			$imagedata['width']  = $imagedata['sizes']['full']['width'];
+		}
 		foreach ( $imagedata['sizes'] as $_size => $data ) {
-			// already cropped to width or height; so use this size
+			// If there's an exact match to an existing image size, short circuit.
-			if ( ( $data['width'] == $size[0] && $data['height'] <= $size[1] ) || ( $data['height'] == $size[1] && $data['width'] <= $size[0] ) ) {
+			if ( $data['width'] == $size[0] && $data['height'] == $size[1] ) {
-				$file = $data['file'];
+				$candidates[ $data['width'] * $data['height'] ] = $data;
-				list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
+				break;
-				return compact( 'file', 'width', 'height' );
 			}
-			// add to lookup table: area => size
-			$areas[$data['width'] * $data['height']] = $_size;
+			// If it's not an exact match, consider larger sizes with the same aspect ratio.
-		}
+			if ( $data['width'] >= $size[0] && $data['height'] >= $size[1] ) {
-		if ( !$size || !empty($areas) ) {
+				// If '0' is passed to either size, we test ratios against the original file.
-			// find for the smallest image not smaller than the desired size
+				if ( 0 === $size[0] || 0 === $size[1] ) {
-			ksort($areas);
+					$same_ratio = wp_image_matches_ratio( $data['width'], $data['height'], $imagedata['width'], $imagedata['height'] );
-			foreach ( $areas as $_size ) {
+				} else {
-				$data = $imagedata['sizes'][$_size];
+					$same_ratio = wp_image_matches_ratio( $data['width'], $data['height'], $size[0], $size[1] );
-				if ( $data['width'] >= $size[0] || $data['height'] >= $size[1] ) {
+				}
-					// Skip images with unexpectedly divergent aspect ratios (crops)
-					// First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop
+				if ( $same_ratio ) {
-					$maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false );
+					$candidates[ $data['width'] * $data['height'] ] = $data;
-					// If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
-					if ( 'thumbnail' != $_size && ( !$maybe_cropped || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) ) )
-						continue;
-					// If we're still here, then we're going to use this size
-					$file = $data['file'];
-					list($width, $height) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
-					return compact( 'file', 'width', 'height' );
 				}
 			}
 		}
-	}
+		if ( ! empty( $candidates ) ) {
-	if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
+			// Sort the array by size if we have more than one candidate.
+			if ( 1 < count( $candidates ) ) {
+				ksort( $candidates );
+			}
+			$data = array_shift( $candidates );
+		/*
+		 * When the size requested is smaller than the thumbnail dimensions, we
+		 * fall back to the thumbnail size to maintain backwards compatibility with
+		 * pre 4.6 versions of WordPress.
+		 */
+		} elseif ( ! empty( $imagedata['sizes']['thumbnail'] ) && $imagedata['sizes']['thumbnail']['width'] >= $size[0] && $imagedata['sizes']['thumbnail']['width'] >= $size[1] ) {
+			$data = $imagedata['sizes']['thumbnail'];
+		} else {
+			return false;
+		}
+		// Constrain the width and height attributes to the requested values.
+		list( $data['width'], $data['height'] ) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
+	} elseif ( ! empty( $imagedata['sizes'][ $size ] ) ) {
+		$data = $imagedata['sizes'][ $size ];
+	}
+	// If we still don't have a match at this point, return false.
+	if ( empty( $data ) ) {
 		return false;
+	}
-	$data = $imagedata['sizes'][$size];
 	// include the full filesystem path of the intermediate file
-	if ( empty($data['path']) && !empty($data['file']) ) {
+	if ( empty( $data['path'] ) && ! empty( $data['file'] ) && ! empty( $imagedata['file'] ) ) {
 		$file_url = wp_get_attachment_url($post_id);
 		$data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
 		$data['url'] = path_join( dirname($file_url), $data['file'] );
 	}
-	return $data;
+	/**
+	 * Filters the output of image_get_intermediate_size()
+	 *
+	 * @since 4.4.0
+	 *
+	 * @see image_get_intermediate_size()
+	 *
+	 * @param array        $data    Array of file relative path, width, and height on success. May also include
+	 *                              file absolute path and URL.
+	 * @param int          $post_id The post_id of the image attachment
+	 * @param string|array $size    Registered image size or flat array of initially-requested height and width
+	 *                              dimensions (in that order).
+	 */
+	return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size );
 }
 /**
 * Gets the available intermediate image sizes.
 *
 * @since 3.0.0
 *
-* @global array $_wp_additional_image_sizes
-*
 * @return array Returns a filtered array of image size strings.
 */
 function get_intermediate_image_sizes() {
-	global $_wp_additional_image_sizes;
+	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
-	$image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
+	$image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
-	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
+	if ( ! empty( $_wp_additional_image_sizes ) ) {
 		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	}
-	/**
-	 * Filter the list of intermediate image sizes.
+	/**
+	 * Filters the list of intermediate image sizes.
 	 *
 	 * @since 2.5.0
 	 *
 	 * @param array $image_sizes An array of intermediate image sizes. Defaults
-	 *                           are 'thumbnail', 'medium', 'large'.
+	 *                           are 'thumbnail', 'medium', 'medium_large', 'large'.
 	 */
 	return apply_filters( 'intermediate_image_sizes', $image_sizes );
 }
 /**
 * Retrieve an image to represent an attachment.
 *
 * A mime icon for files, thumbnail or intermediate size for images.
 *
+* The returned array contains four values: the URL of the attachment image src,
+* the width of the image file, the height of the image file, and a boolean
+* representing whether the returned array describes an intermediate (generated)
+* image size or the original, full-sized upload.
+*
 * @since 2.5.0
 *
 * @param int          $attachment_id Image attachment ID.
-* @param string|array $size          Optional. Registered image size to retrieve the source for or a flat
+* @param string|array $size          Optional. Image size. Accepts any valid image size, or an array of width
-*                                    array of height and width dimensions. Default 'thumbnail'.
+*                                    and height values in pixels (in that order). Default 'thumbnail'.
 * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
-* @return bool|array Returns an array (url, width, height), or false, if no image is available.
+* @return false|array Returns an array (url, width, height, is_intermediate), or false, if no image is available.
 */
 function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) {
 	// get a thumbnail or intermediate image if there is one
-	if ( $image = image_downsize($attachment_id, $size) )
+	$image = image_downsize( $attachment_id, $size );
-		return $image;
+	if ( ! $image ) {
+		$src = false;
-	$src = false;
+		if ( $icon && $src = wp_mime_type_icon( $attachment_id ) ) {
-	if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
+			/** This filter is documented in wp-includes/post.php */
-		/** This filter is documented in wp-includes/post.php */
+			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
-		$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$src_file = $icon_dir . '/' . wp_basename( $src );
-		$src_file = $icon_dir . '/' . wp_basename($src);
+			@list( $width, $height ) = getimagesize( $src_file );
-		@list($width, $height) = getimagesize($src_file);
+		}
-	}
-	if ( $src && $width && $height )
+		if ( $src && $width && $height ) {
-		return array( $src, $width, $height );
+			$image = array( $src, $width, $height );
-	return false;
+		}
+	}
+	/**
+	 * Filters the image src result.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param array|false  $image         Either array with src, width & height, icon src, or false.
+	 * @param int          $attachment_id Image attachment ID.
+	 * @param string|array $size          Size of image. Image size or array of width and height values
+	 *                                    (in that order). Default 'thumbnail'.
+	 * @param bool         $icon          Whether the image should be treated as an icon. Default false.
+	 */
+	return apply_filters( 'wp_get_attachment_image_src', $image, $attachment_id, $size, $icon );
 }
 /**
 * Get an HTML img element representing an image attachment
 *
 * browser scale down the image.
 *
 * @since 2.5.0
 *
 * @param int          $attachment_id Image attachment ID.
-* @param string|array $size          Optional. Registered image size or flat array of height and width
+* @param string|array $size          Optional. Image size. Accepts any valid image size, or an array of width
-*                                    dimensions. Default 'thumbnail'.
+*                                    and height values in pixels (in that order). Default 'thumbnail'.
 * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
 * @param string|array $attr          Optional. Attributes for the image markup. Default empty.
 * @return string HTML img element or empty string on failure.
 */
 function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') {
 	$html = '';
 	$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
 	if ( $image ) {
 		list($src, $width, $height) = $image;
 		$hwstring = image_hwstring($width, $height);
 			$size_class = join( 'x', $size_class );
 		}
 		$attachment = get_post($attachment_id);
 		$default_attr = array(
 			'src'	=> $src,
-			'class'	=> "attachment-$size_class",
+			'class'	=> "attachment-$size_class size-$size_class",
-			'alt'	=> trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
+			'alt'	=> trim( strip_tags( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) ),
 		);
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
+		$attr = wp_parse_args( $attr, $default_attr );
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+		// Generate 'srcset' and 'sizes' if not already present.
+		if ( empty( $attr['srcset'] ) ) {
-		$attr = wp_parse_args($attr, $default_attr);
+			$image_meta = wp_get_attachment_metadata( $attachment_id );
+			if ( is_array( $image_meta ) ) {
+				$size_array = array( absint( $width ), absint( $height ) );
+				$srcset = wp_calculate_image_srcset( $size_array, $src, $image_meta, $attachment_id );
+				$sizes = wp_calculate_image_sizes( $size_array, $src, $image_meta, $attachment_id );
+				if ( $srcset && ( $sizes || ! empty( $attr['sizes'] ) ) ) {
+					$attr['srcset'] = $srcset;
+					if ( empty( $attr['sizes'] ) ) {
+						$attr['sizes'] = $sizes;
+					}
+				}
+			}
+		}
 		/**
-		 * Filter the list of attachment image attributes.
+		 * Filters the list of attachment image attributes.
 		 *
 		 * @since 2.8.0
 		 *
 		 * @param array        $attr       Attributes for the image markup.
 		 * @param WP_Post      $attachment Image attachment post.
-		 * @param string|array $size       Requested size.
+		 * @param string|array $size       Requested size. Image size or array of width and height values
+		 *                                 (in that order). Default 'thumbnail'.
 		 */
 		$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
 		$attr = array_map( 'esc_attr', $attr );
 		$html = rtrim("<img $hwstring");
 		foreach ( $attr as $name => $value ) {
 	return $html;
 }
 /**
+* Get the URL of an image attachment.
+*
+* @since 4.4.0
+*
+* @param int          $attachment_id Image attachment ID.
+* @param string|array $size          Optional. Image size to retrieve. Accepts any valid image size, or an array
+*                                    of width and height values in pixels (in that order). Default 'thumbnail'.
+* @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
+* @return string|false Attachment URL or false if no image is available.
+*/
+function wp_get_attachment_image_url( $attachment_id, $size = 'thumbnail', $icon = false ) {
+	$image = wp_get_attachment_image_src( $attachment_id, $size, $icon );
+	return isset( $image['0'] ) ? $image['0'] : false;
+}
+/**
+* Get the attachment path relative to the upload directory.
+*
+* @since 4.4.1
+* @access private
+*
+* @param string $file Attachment file name.
+* @return string Attachment path relative to the upload directory.
+*/
+function _wp_get_attachment_relative_path( $file ) {
+	$dirname = dirname( $file );
+	if ( '.' === $dirname ) {
+		return '';
+	}
+	if ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {
+		// Get the directory name relative to the upload directory (back compat for pre-2.7 uploads)
+		$dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );
+		$dirname = ltrim( $dirname, '/' );
+	}
+	return $dirname;
+}
+/**
+* Get the image size as array from its meta data.
+*
+* Used for responsive images.
+*
+* @since 4.4.0
+* @access private
+*
+* @param string $size_name  Image size. Accepts any valid image size name ('thumbnail', 'medium', etc.).
+* @param array  $image_meta The image meta data.
+* @return array|bool Array of width and height values in pixels (in that order)
+*                    or false if the size doesn't exist.
+*/
+function _wp_get_image_size_from_meta( $size_name, $image_meta ) {
+	if ( $size_name === 'full' ) {
+		return array(
+			absint( $image_meta['width'] ),
+			absint( $image_meta['height'] ),
+		);
+	} elseif ( ! empty( $image_meta['sizes'][$size_name] ) ) {
+		return array(
+			absint( $image_meta['sizes'][$size_name]['width'] ),
+			absint( $image_meta['sizes'][$size_name]['height'] ),
+		);
+	}
+	return false;
+}
+/**
+* Retrieves the value for an image attachment's 'srcset' attribute.
+*
+* @since 4.4.0
+*
+* @see wp_calculate_image_srcset()
+*
+* @param int          $attachment_id Image attachment ID.
+* @param array|string $size          Optional. Image size. Accepts any valid image size, or an array of
+*                                    width and height values in pixels (in that order). Default 'medium'.
+* @param array        $image_meta    Optional. The image meta data as returned by 'wp_get_attachment_metadata()'.
+*                                    Default null.
+* @return string|bool A 'srcset' value string or false.
+*/
+function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium', $image_meta = null ) {
+	if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
+		return false;
+	}
+	if ( ! is_array( $image_meta ) ) {
+		$image_meta = wp_get_attachment_metadata( $attachment_id );
+	}
+	$image_src = $image[0];
+	$size_array = array(
+		absint( $image[1] ),
+		absint( $image[2] )
+	);
+	return wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
+}
+/**
+* A helper function to calculate the image sources to include in a 'srcset' attribute.
+*
+* @since 4.4.0
+*
+* @param array  $size_array    Array of width and height values in pixels (in that order).
+* @param string $image_src     The 'src' of the image.
+* @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
+* @param int    $attachment_id Optional. The image attachment ID to pass to the filter. Default 0.
+* @return string|bool          The 'srcset' attribute value. False on error or when only one source exists.
+*/
+function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id = 0 ) {
+	/**
+	 * Let plugins pre-filter the image meta to be able to fix inconsistencies in the stored data.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
+	 * @param array  $size_array    Array of width and height values in pixels (in that order).
+	 * @param string $image_src     The 'src' of the image.
+	 * @param int    $attachment_id The image attachment ID or 0 if not supplied.
+	 */
+	$image_meta = apply_filters( 'wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id );
+	if ( empty( $image_meta['sizes'] ) || ! isset( $image_meta['file'] ) || strlen( $image_meta['file'] ) < 4 ) {
+		return false;
+	}
+	$image_sizes = $image_meta['sizes'];
+	// Get the width and height of the image.
+	$image_width = (int) $size_array[0];
+	$image_height = (int) $size_array[1];
+	// Bail early if error/no width.
+	if ( $image_width < 1 ) {
+		return false;
+	}
+	$image_basename = wp_basename( $image_meta['file'] );
+	/*
+	 * WordPress flattens animated GIFs into one frame when generating intermediate sizes.
+	 * To avoid hiding animation in user content, if src is a full size GIF, a srcset attribute is not generated.
+	 * If src is an intermediate size GIF, the full size is excluded from srcset to keep a flattened GIF from becoming animated.
+	 */
+	if ( ! isset( $image_sizes['thumbnail']['mime-type'] ) || 'image/gif' !== $image_sizes['thumbnail']['mime-type'] ) {
+		$image_sizes[] = array(
+			'width'  => $image_meta['width'],
+			'height' => $image_meta['height'],
+			'file'   => $image_basename,
+		);
+	} elseif ( strpos( $image_src, $image_meta['file'] ) ) {
+		return false;
+	}
+	// Retrieve the uploads sub-directory from the full size image.
+	$dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
+	if ( $dirname ) {
+		$dirname = trailingslashit( $dirname );
+	}
+	$upload_dir = wp_get_upload_dir();
+	$image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname;
+	/*
+	 * If currently on HTTPS, prefer HTTPS URLs when we know they're supported by the domain
+	 * (which is to say, when they share the domain name of the current request).
+	 */
+	if ( is_ssl() && 'https' !== substr( $image_baseurl, 0, 5 ) && parse_url( $image_baseurl, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
+		$image_baseurl = set_url_scheme( $image_baseurl, 'https' );
+	}
+	/*
+	 * Images that have been edited in WordPress after being uploaded will
+	 * contain a unique hash. Look for that hash and use it later to filter
+	 * out images that are leftovers from previous versions.
+	 */
+	$image_edited = preg_match( '/-e[0-9]{13}/', wp_basename( $image_src ), $image_edit_hash );
+	/**
+	 * Filters the maximum image width to be included in a 'srcset' attribute.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param int   $max_width  The maximum image width to be included in the 'srcset'. Default '1600'.
+	 * @param array $size_array Array of width and height values in pixels (in that order).
+	 */
+	$max_srcset_image_width = apply_filters( 'max_srcset_image_width', 1600, $size_array );
+	// Array to hold URL candidates.
+	$sources = array();
+	/**
+	 * To make sure the ID matches our image src, we will check to see if any sizes in our attachment
+	 * meta match our $image_src. If no matches are found we don't return a srcset to avoid serving
+	 * an incorrect image. See #35045.
+	 */
+	$src_matched = false;
+	/*
+	 * Loop through available images. Only use images that are resized
+	 * versions of the same edit.
+	 */
+	foreach ( $image_sizes as $image ) {
+		$is_src = false;
+		// Check if image meta isn't corrupted.
+		if ( ! is_array( $image ) ) {
+			continue;
+		}
+		// If the file name is part of the `src`, we've confirmed a match.
+		if ( ! $src_matched && false !== strpos( $image_src, $dirname . $image['file'] ) ) {
+			$src_matched = $is_src = true;
+		}
+		// Filter out images that are from previous edits.
+		if ( $image_edited && ! strpos( $image['file'], $image_edit_hash[0] ) ) {
+			continue;
+		}
+		/*
+		 * Filters out images that are wider than '$max_srcset_image_width' unless
+		 * that file is in the 'src' attribute.
+		 */
+		if ( $max_srcset_image_width && $image['width'] > $max_srcset_image_width && ! $is_src ) {
+			continue;
+		}
+		// If the image dimensions are within 1px of the expected size, use it.
+		if ( wp_image_matches_ratio( $image_width, $image_height, $image['width'], $image['height'] ) ) {
+			// Add the URL, descriptor, and value to the sources array to be returned.
+			$source = array(
+				'url'        => $image_baseurl . $image['file'],
+				'descriptor' => 'w',
+				'value'      => $image['width'],
+			);
+			// The 'src' image has to be the first in the 'srcset', because of a bug in iOS8. See #35030.
+			if ( $is_src ) {
+				$sources = array( $image['width'] => $source ) + $sources;
+			} else {
+				$sources[ $image['width'] ] = $source;
+			}
+		}
+	}
+	/**
+	 * Filters an image's 'srcset' sources.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param array  $sources {
+	 *     One or more arrays of source data to include in the 'srcset'.
+	 *
+	 *     @type array $width {
+	 *         @type string $url        The URL of an image source.
+	 *         @type string $descriptor The descriptor type used in the image candidate string,
+	 *                                  either 'w' or 'x'.
+	 *         @type int    $value      The source width if paired with a 'w' descriptor, or a
+	 *                                  pixel density value if paired with an 'x' descriptor.
+	 *     }
+	 * }
+	 * @param array  $size_array    Array of width and height values in pixels (in that order).
+	 * @param string $image_src     The 'src' of the image.
+	 * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
+	 * @param int    $attachment_id Image attachment ID or 0.
+	 */
+	$sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
+	// Only return a 'srcset' value if there is more than one source.
+	if ( ! $src_matched || ! is_array( $sources ) || count( $sources ) < 2 ) {
+		return false;
+	}
+	$srcset = '';
+	foreach ( $sources as $source ) {
+		$srcset .= str_replace( ' ', '%20', $source['url'] ) . ' ' . $source['value'] . $source['descriptor'] . ', ';
+	}
+	return rtrim( $srcset, ', ' );
+}
+/**
+* Retrieves the value for an image attachment's 'sizes' attribute.
+*
+* @since 4.4.0
+*
+* @see wp_calculate_image_sizes()
+*
+* @param int          $attachment_id Image attachment ID.
+* @param array|string $size          Optional. Image size. Accepts any valid image size, or an array of width
+*                                    and height values in pixels (in that order). Default 'medium'.
+* @param array        $image_meta    Optional. The image meta data as returned by 'wp_get_attachment_metadata()'.
+*                                    Default null.
+* @return string|bool A valid source size value for use in a 'sizes' attribute or false.
+*/
+function wp_get_attachment_image_sizes( $attachment_id, $size = 'medium', $image_meta = null ) {
+	if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
+		return false;
+	}
+	if ( ! is_array( $image_meta ) ) {
+		$image_meta = wp_get_attachment_metadata( $attachment_id );
+	}
+	$image_src = $image[0];
+	$size_array = array(
+		absint( $image[1] ),
+		absint( $image[2] )
+	);
+	return wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+}
+/**
+* Creates a 'sizes' attribute value for an image.
+*
+* @since 4.4.0
+*
+* @param array|string $size          Image size to retrieve. Accepts any valid image size, or an array
+*                                    of width and height values in pixels (in that order). Default 'medium'.
+* @param string       $image_src     Optional. The URL to the image file. Default null.
+* @param array        $image_meta    Optional. The image meta data as returned by 'wp_get_attachment_metadata()'.
+*                                    Default null.
+* @param int          $attachment_id Optional. Image attachment ID. Either `$image_meta` or `$attachment_id`
+*                                    is needed when using the image size name as argument for `$size`. Default 0.
+* @return string|bool A valid source size value for use in a 'sizes' attribute or false.
+*/
+function wp_calculate_image_sizes( $size, $image_src = null, $image_meta = null, $attachment_id = 0 ) {
+	$width = 0;
+	if ( is_array( $size ) ) {
+		$width = absint( $size[0] );
+	} elseif ( is_string( $size ) ) {
+		if ( ! $image_meta && $attachment_id ) {
+			$image_meta = wp_get_attachment_metadata( $attachment_id );
+		}
+		if ( is_array( $image_meta ) ) {
+			$size_array = _wp_get_image_size_from_meta( $size, $image_meta );
+			if ( $size_array ) {
+				$width = absint( $size_array[0] );
+			}
+		}
+	}
+	if ( ! $width ) {
+		return false;
+	}
+	// Setup the default 'sizes' attribute.
+	$sizes = sprintf( '(max-width: %1$dpx) 100vw, %1$dpx', $width );
+	/**
+	 * Filters the output of 'wp_calculate_image_sizes()'.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param string       $sizes         A source size value for use in a 'sizes' attribute.
+	 * @param array|string $size          Requested size. Image size or array of width and height values
+	 *                                    in pixels (in that order).
+	 * @param string|null  $image_src     The URL to the image file or null.
+	 * @param array|null   $image_meta    The image meta data as returned by wp_get_attachment_metadata() or null.
+	 * @param int          $attachment_id Image attachment ID of the original image or 0.
+	 */
+	return apply_filters( 'wp_calculate_image_sizes', $sizes, $size, $image_src, $image_meta, $attachment_id );
+}
+/**
+* Filters 'img' elements in post content to add 'srcset' and 'sizes' attributes.
+*
+* @since 4.4.0
+*
+* @see wp_image_add_srcset_and_sizes()
+*
+* @param string $content The raw post content to be filtered.
+* @return string Converted content with 'srcset' and 'sizes' attributes added to images.
+*/
+function wp_make_content_images_responsive( $content ) {
+	if ( ! preg_match_all( '/<img [^>]+>/', $content, $matches ) ) {
+		return $content;
+	}
+	$selected_images = $attachment_ids = array();
+	foreach( $matches[0] as $image ) {
+		if ( false === strpos( $image, ' srcset=' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) &&
+			( $attachment_id = absint( $class_id[1] ) ) ) {
+			/*
+			 * If exactly the same image tag is used more than once, overwrite it.
+			 * All identical tags will be replaced later with 'str_replace()'.
+			 */
+			$selected_images[ $image ] = $attachment_id;
+			// Overwrite the ID when the same image is included more than once.
+			$attachment_ids[ $attachment_id ] = true;
+		}
+	}
+	if ( count( $attachment_ids ) > 1 ) {
+		/*
+		 * Warm the object cache with post and meta information for all found
+		 * images to avoid making individual database calls.
+		 */
+		_prime_post_caches( array_keys( $attachment_ids ), false, true );
+	}
+	foreach ( $selected_images as $image => $attachment_id ) {
+		$image_meta = wp_get_attachment_metadata( $attachment_id );
+		$content = str_replace( $image, wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ), $content );
+	}
+	return $content;
+}
+/**
+* Adds 'srcset' and 'sizes' attributes to an existing 'img' element.
+*
+* @since 4.4.0
+*
+* @see wp_calculate_image_srcset()
+* @see wp_calculate_image_sizes()
+*
+* @param string $image         An HTML 'img' element to be filtered.
+* @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
+* @param int    $attachment_id Image attachment ID.
+* @return string Converted 'img' element with 'srcset' and 'sizes' attributes added.
+*/
+function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
+	// Ensure the image meta exists.
+	if ( empty( $image_meta['sizes'] ) ) {
+		return $image;
+	}
+	$image_src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : '';
+	list( $image_src ) = explode( '?', $image_src );
+	// Return early if we couldn't get the image source.
+	if ( ! $image_src ) {
+		return $image;
+	}
+	// Bail early if an image has been inserted and later edited.
+	if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash ) &&
+		strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) {
+		return $image;
+	}
+	$width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : 0;
+	$height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;
+	if ( ! $width || ! $height ) {
+		/*
+		 * If attempts to parse the size value failed, attempt to use the image meta data to match
+		 * the image file name from 'src' against the available sizes for an attachment.
+		 */
+		$image_filename = wp_basename( $image_src );
+		if ( $image_filename === wp_basename( $image_meta['file'] ) ) {
+			$width = (int) $image_meta['width'];
+			$height = (int) $image_meta['height'];
+		} else {
+			foreach( $image_meta['sizes'] as $image_size_data ) {
+				if ( $image_filename === $image_size_data['file'] ) {
+					$width = (int) $image_size_data['width'];
+					$height = (int) $image_size_data['height'];
+					break;
+				}
+			}
+		}
+	}
+	if ( ! $width || ! $height ) {
+		return $image;
+	}
+	$size_array = array( $width, $height );
+	$srcset = wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
+	if ( $srcset ) {
+		// Check if there is already a 'sizes' attribute.
+		$sizes = strpos( $image, ' sizes=' );
+		if ( ! $sizes ) {
+			$sizes = wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+		}
+	}
+	if ( $srcset && $sizes ) {
+		// Format the 'srcset' and 'sizes' string and escape attributes.
+		$attr = sprintf( ' srcset="%s"', esc_attr( $srcset ) );
+		if ( is_string( $sizes ) ) {
+			$attr .= sprintf( ' sizes="%s"', esc_attr( $sizes ) );
+		}
+		// Add 'srcset' and 'sizes' attributes to the image markup.
+		$image = preg_replace( '/<img ([^>]+?)[\/ ]*>/', '<img $1' . $attr . ' />', $image );
+	}
+	return $image;
+}
+/**
 * Adds a 'wp-post-image' class to post thumbnails. Internal use only.
 *
-* Uses the 'begin_fetch_post_thumbnail_html' and 'end_fetch_post_thumbnail_html' action hooks to
+* Uses the {@see 'begin_fetch_post_thumbnail_html'} and {@see 'end_fetch_post_thumbnail_html'}
-* dynamically add/remove itself so as to only filter post thumbnails.
+* action hooks to dynamically add/remove itself so as to only filter post thumbnails.
 *
 * @ignore
 * @since 2.9.0
 *
 * @param array $attr Thumbnail attributes including src, class, alt, title.
 /**
 * Builds the Caption shortcode output.
 *
 * Allows a plugin to replace the content that would otherwise be returned. The
-* filter is 'img_caption_shortcode' and passes an empty string, the attr
+* filter is {@see 'img_caption_shortcode'} and passes an empty string, the attr
 * parameter and the content parameter values.
 *
 * The supported attributes for the shortcode are 'id', 'align', 'width', and
 * 'caption'.
 *
 	if ( ! isset( $attr['caption'] ) ) {
 		if ( preg_match( '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches ) ) {
 			$content = $matches[1];
 			$attr['caption'] = trim( $matches[2] );
 		}
-	}
+	} elseif ( strpos( $attr['caption'], '<' ) !== false ) {
+		$attr['caption'] = wp_kses( $attr['caption'], 'post' );
-	/**
+	}
-	 * Filter the default caption shortcode output.
+	/**
+	 * Filters the default caption shortcode output.
 	 *
 	 * If the filtered output isn't empty, it will be used instead of generating
 	 * the default caption template.
 	 *
 	 * @since 2.6.0
 	$atts['width'] = (int) $atts['width'];
 	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
 		return $content;
 	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( $atts['id'] ) . '" ';
+		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
 	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
-	if ( current_theme_supports( 'html5', 'caption' ) ) {
+	$html5 = current_theme_supports( 'html5', 'caption' );
-		return '<figure ' . $atts['id'] . 'style="width: ' . (int) $atts['width'] . 'px;" class="' . esc_attr( $class ) . '">'
+	// HTML5 captions never added the extra 10px to the image width
-		. do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+	$width = $html5 ? $atts['width'] : ( 10 + $atts['width'] );
-	}
+	/**
-	$caption_width = 10 + $atts['width'];
+	 * Filters the width of an image's caption.
-	/**
-	 * Filter the width of an image's caption.
 	 *
 	 * By default, the caption is 10 pixels greater than the width of the image,
 	 * to prevent post content from running up against a floated image.
 	 *
 	 * @since 3.7.0
 	 *
 	 * @see img_caption_shortcode()
 	 *
-	 * @param int    $caption_width Width of the caption in pixels. To remove this inline style,
+	 * @param int    $width    Width of the caption in pixels. To remove this inline style,
-	 *                              return zero.
+	 *                         return zero.
-	 * @param array  $atts          Attributes of the caption shortcode.
+	 * @param array  $atts     Attributes of the caption shortcode.
-	 * @param string $content       The image element, possibly wrapped in a hyperlink.
+	 * @param string $content  The image element, possibly wrapped in a hyperlink.
 	 */
-	$caption_width = apply_filters( 'img_caption_shortcode_width', $caption_width, $atts, $content );
+	$caption_width = apply_filters( 'img_caption_shortcode_width', $width, $atts, $content );
 	$style = '';
-	if ( $caption_width )
+	if ( $caption_width ) {
 		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	}
-	return '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-	. do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+	if ( $html5 ) {
+		$html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
+		. do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+	} else {
+		$html = '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
+		. do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+	}
+	return $html;
 }
 add_shortcode('gallery', 'gallery_shortcode');
 /**
 * This implements the functionality of the Gallery Shortcode for displaying
 * WordPress images on a post.
 *
 * @since 2.5.0
 *
+* @staticvar int $instance
+*
 * @param array $attr {
 *     Attributes of the gallery shortcode.
 *
-*     @type string $order      Order of the images in the gallery. Default 'ASC'. Accepts 'ASC', 'DESC'.
+*     @type string       $order      Order of the images in the gallery. Default 'ASC'. Accepts 'ASC', 'DESC'.
-*     @type string $orderby    The field to use when ordering the images. Default 'menu_order ID'.
+*     @type string       $orderby    The field to use when ordering the images. Default 'menu_order ID'.
-*                              Accepts any valid SQL ORDERBY statement.
+*                                    Accepts any valid SQL ORDERBY statement.
-*     @type int    $id         Post ID.
+*     @type int          $id         Post ID.
-*     @type string $itemtag    HTML tag to use for each image in the gallery.
+*     @type string       $itemtag    HTML tag to use for each image in the gallery.
-*                              Default 'dl', or 'figure' when the theme registers HTML5 gallery support.
+*                                    Default 'dl', or 'figure' when the theme registers HTML5 gallery support.
-*     @type string $icontag    HTML tag to use for each image's icon.
+*     @type string       $icontag    HTML tag to use for each image's icon.
-*                              Default 'dt', or 'div' when the theme registers HTML5 gallery support.
+*                                    Default 'dt', or 'div' when the theme registers HTML5 gallery support.
-*     @type string $captiontag HTML tag to use for each image's caption.
+*     @type string       $captiontag HTML tag to use for each image's caption.
-*                              Default 'dd', or 'figcaption' when the theme registers HTML5 gallery support.
+*                                    Default 'dd', or 'figcaption' when the theme registers HTML5 gallery support.
-*     @type int    $columns    Number of columns of images to display. Default 3.
+*     @type int          $columns    Number of columns of images to display. Default 3.
-*     @type string $size       Size of the images to display. Default 'thumbnail'.
+*     @type string|array $size       Size of the images to display. Accepts any valid image size, or an array of width
-*     @type string $ids        A comma-separated list of IDs of attachments to display. Default empty.
+*                                    and height values in pixels (in that order). Default 'thumbnail'.
-*     @type string $include    A comma-separated list of IDs of attachments to include. Default empty.
+*     @type string       $ids        A comma-separated list of IDs of attachments to display. Default empty.
-*     @type string $exclude    A comma-separated list of IDs of attachments to exclude. Default empty.
+*     @type string       $include    A comma-separated list of IDs of attachments to include. Default empty.
-*     @type string $link       What to link each image to. Default empty (links to the attachment page).
+*     @type string       $exclude    A comma-separated list of IDs of attachments to exclude. Default empty.
-*                              Accepts 'file', 'none'.
+*     @type string       $link       What to link each image to. Default empty (links to the attachment page).
+*                                    Accepts 'file', 'none'.
 * }
 * @return string HTML content to display gallery.
 */
 function gallery_shortcode( $attr ) {
 	$post = get_post();
 		}
 		$attr['include'] = $attr['ids'];
 	}
 	/**
-	 * Filter the default gallery shortcode output.
+	 * Filters the default gallery shortcode output.
 	 *
 	 * If the filtered output isn't empty, it will be used instead of generating
 	 * the default gallery template.
 	 *
 	 * @since 2.5.0
 	$selector = "gallery-{$instance}";
 	$gallery_style = '';
 	/**
-	 * Filter whether to print default gallery styles.
+	 * Filters whether to print default gallery styles.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @param bool $print Whether to print default gallery styles.
 	 *                    Defaults to false if the theme supports HTML5 galleries.
 	$size_class = sanitize_html_class( $atts['size'] );
 	$gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
 	/**
-	 * Filter the default gallery shortcode CSS styles.
+	 * Filters the default gallery shortcode CSS styles.
 	 *
 	 * @since 2.5.0
 	 *
 	 * @param string $gallery_style Default CSS styles and opening HTML div container
 	 *                              for the gallery shortcode output.
 */
 function wp_underscore_playlist_templates() {
 ?>
 <script type="text/html" id="tmpl-wp-playlist-current-item">
 	<# if ( data.image ) { #>
-	<img src="{{ data.thumb.src }}"/>
+	<img src="{{ data.thumb.src }}" alt="" />
 	<# } #>
 	<div class="wp-playlist-caption">
-		<span class="wp-playlist-item-meta wp-playlist-item-title">&#8220;{{ data.title }}&#8221;</span>
+		<span class="wp-playlist-item-meta wp-playlist-item-title"><?php
+			/* translators: playlist item title */
+			printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{ data.title }}' );
+		?></span>
 		<# if ( data.meta.album ) { #><span class="wp-playlist-item-meta wp-playlist-item-album">{{ data.meta.album }}</span><# } #>
 		<# if ( data.meta.artist ) { #><span class="wp-playlist-item-meta wp-playlist-item-artist">{{ data.meta.artist }}</span><# } #>
 	</div>
 </script>
 <script type="text/html" id="tmpl-wp-playlist-item">
 		<a class="wp-playlist-caption" href="{{ data.src }}">
 			{{ data.index ? ( data.index + '. ' ) : '' }}
 			<# if ( data.caption ) { #>
 				{{ data.caption }}
 			<# } else { #>
-				<span class="wp-playlist-item-title">&#8220;{{{ data.title }}}&#8221;</span>
+				<span class="wp-playlist-item-title"><?php
+					/* translators: playlist item title */
+					printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{{ data.title }}}' );
+				?></span>
 				<# if ( data.artists && data.meta.artist ) { #>
 				<span class="wp-playlist-item-artist"> &mdash; {{ data.meta.artist }}</span>
 				<# } #>
 			<# } #>
 		</a>
 *
 * This implements the functionality of the playlist shortcode for displaying
 * a collection of WordPress audio or video files in a post.
 *
 * @since 3.9.0
+*
+* @global int $content_width
+* @staticvar int $instance
 *
 * @param array $attr {
 *     Array of default playlist attributes.
 *
 *     @type string  $type         Type of playlist to display. Accepts 'audio' or 'video'. Default 'audio'.
 		}
 		$attr['include'] = $attr['ids'];
 	}
 	/**
-	 * Filter the playlist output.
+	 * Filters the playlist output.
 	 *
 	 * Passing a non-empty value to the filter will short-circuit generation
 	 * of the default playlist output, returning the passed value instead.
 	 *
 	 * @since 3.9.0
 	ob_start();
 	if ( 1 === $instance ) {
 		/**
-		 * Print and enqueue playlist scripts, styles, and JavaScript templates.
+		 * Prints and enqueues playlist scripts, styles, and JavaScript templates.
 		 *
 		 * @since 3.9.0
 		 *
 		 * @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'.
 	<?php endif ?>
 	<<?php echo $safe_type ?> controls="controls" preload="none" width="<?php
 		echo (int) $theme_width;
 	?>"<?php if ( 'video' === $safe_type ):
 		echo ' height="', (int) $theme_height, '"';
-	else:
-		echo ' style="visibility: hidden"';
 	endif; ?>></<?php echo $safe_type ?>>
 	<div class="wp-playlist-next"></div>
 	<div class="wp-playlist-prev"></div>
 	<noscript>
 	<ol><?php
 * @param string $url The media element URL.
 * @return string Fallback HTML.
 */
 function wp_mediaelement_fallback( $url ) {
 	/**
-	 * Filter the Mediaelement fallback output for no-JS.
+	 * Filters the Mediaelement fallback output for no-JS.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param string $output Fallback output for no-JS.
 	 * @param string $url    Media file URL.
 *
 * @return array Supported audio formats.
 */
 function wp_get_audio_extensions() {
 	/**
-	 * Filter the list of supported audio formats.
+	 * Filters the list of supported audio formats.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param array $extensions An array of support audio formats. Defaults are
-	 *                          'mp3', 'ogg', 'wma', 'm4a', 'wav'.
+	 *                          'mp3', 'ogg', 'flac', 'm4a', 'wav'.
 	 */
-	return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'wma', 'm4a', 'wav' ) );
+	return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'flac', 'm4a', 'wav' ) );
 }
 /**
 * Returns useful keys to use to lookup data from an attachment's stored metadata.
 *
 		$fields['bitrate']          = __( 'Bitrate' );
 		$fields['bitrate_mode']     = __( 'Bitrate Mode' );
 	}
 	/**
-	 * Filter the editable list of keys to look up data from an attachment's metadata.
+	 * Filters the editable list of keys to look up data from an attachment's metadata.
 	 *
 	 * @since 3.9.0
 	 *
 	 * @param array   $fields     Key/value pairs of field keys to labels.
 	 * @param WP_Post $attachment Attachment object.
 * This implements the functionality of the Audio Shortcode for displaying
 * WordPress mp3s in a post.
 *
 * @since 3.6.0
 *
+* @staticvar int $instance
+*
 * @param array  $attr {
 *     Attributes of the audio shortcode.
 *
 *     @type string $src      URL to the source of the audio file. Default empty.
 *     @type string $loop     The 'loop' attribute for the `<audio>` element. Default empty.
 *     @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
-*     @type string $preload  The 'preload' attribute for the `<audio>` element. Default empty.
+*     @type string $preload  The 'preload' attribute for the `<audio>` element. Default 'none'.
 *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
-*     @type string $id       The 'id' attribute for the `<audio>` element. Default 'audio-{$post_id}-{$instance}'.
+*     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%;'.
-*     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%'.
 * }
 * @param string $content Shortcode content.
-* @return string HTML content to display audio.
+* @return string|void HTML content to display audio.
 */
 function wp_audio_shortcode( $attr, $content = '' ) {
 	$post_id = get_post() ? get_the_ID() : 0;
 	static $instance = 0;
 	$instance++;
 	/**
-	 * Filter the default audio shortcode output.
+	 * Filters the default audio shortcode output.
 	 *
 	 * If the filtered output isn't empty, it will be used instead of generating the default audio template.
 	 *
 	 * @since 3.6.0
 	 *
 	$default_types = wp_get_audio_extensions();
 	$defaults_atts = array(
 		'src'      => '',
 		'loop'     => '',
 		'autoplay' => '',
-		'preload'  => 'none'
+		'preload'  => 'none',
+		'class'    => 'wp-audio-shortcode',
+		'style'    => 'width: 100%;'
 	);
 	foreach ( $default_types as $type ) {
 		$defaults_atts[$type] = '';
 	}
 		array_unshift( $default_types, 'src' );
 	}
 	/**
-	 * Filter the media library used for the audio shortcode.
+	 * Filters the media library used for the audio shortcode.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param string $library Media library used for the audio shortcode.
 	 */
 		wp_enqueue_style( 'wp-mediaelement' );
 		wp_enqueue_script( 'wp-mediaelement' );
 	}
 	/**
-	 * Filter the class attribute for the audio shortcode output container.
+	 * Filters the class attribute for the audio shortcode output container.
 	 *
 	 * @since 3.6.0
+	 * @since 4.9.0 The `$atts` parameter was added.
 	 *
 	 * @param string $class CSS class or list of space-separated classes.
-	 */
+	 * @param array  $atts  Array of audio shortcode attributes.
+	 */
+	$atts['class'] = apply_filters( 'wp_audio_shortcode_class', $atts['class'], $atts );
 	$html_atts = array(
-		'class'    => apply_filters( 'wp_audio_shortcode_class', 'wp-audio-shortcode' ),
+		'class'    => $atts['class'],
 		'id'       => sprintf( 'audio-%d-%d', $post_id, $instance ),
 		'loop'     => wp_validate_boolean( $atts['loop'] ),
 		'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
 		'preload'  => $atts['preload'],
-		'style'    => 'width: 100%; visibility: hidden;',
+		'style'    => $atts['style'],
 	);
 	// These ones should just be omitted altogether if they are blank
 	foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {
 		if ( empty( $html_atts[$a] ) ) {
 		$html .= wp_mediaelement_fallback( $fileurl );
 	}
 	$html .= '</audio>';
 	/**
-	 * Filter the audio shortcode output.
+	 * Filters the audio shortcode output.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param string $html    Audio shortcode HTML output.
 	 * @param array  $atts    Array of audio shortcode attributes.
 *
 * @return array List of supported video formats.
 */
 function wp_get_video_extensions() {
 	/**
-	 * Filter the list of supported video formats.
+	 * Filters the list of supported video formats.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param array $extensions An array of support video formats. Defaults are
-	 *                          'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv'.
+	 *                          'mp4', 'm4v', 'webm', 'ogv', 'flv'.
 	 */
-	return apply_filters( 'wp_video_extensions', array( 'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv' ) );
+	return apply_filters( 'wp_video_extensions', array( 'mp4', 'm4v', 'webm', 'ogv', 'flv' ) );
 }
 /**
 * Builds the Video shortcode output.
 *
 * This implements the functionality of the Video Shortcode for displaying
 * WordPress mp4s in a post.
 *
 * @since 3.6.0
+*
+* @global int $content_width
+* @staticvar int $instance
 *
 * @param array  $attr {
 *     Attributes of the shortcode.
 *
 *     @type string $src      URL to the source of the video file. Default empty.
 *     @type string $autoplay The 'autoplay' attribute for the `<video>` element. Default empty.
 *     @type string $preload  The 'preload' attribute for the `<video>` element.
 *                            Default 'metadata'.
 *     @type string $class    The 'class' attribute for the `<video>` element.
 *                            Default 'wp-video-shortcode'.
-*     @type string $id       The 'id' attribute for the `<video>` element.
-*                            Default 'video-{$post_id}-{$instance}'.
 * }
 * @param string $content Shortcode content.
-* @return string HTML content to display video.
+* @return string|void HTML content to display video.
 */
 function wp_video_shortcode( $attr, $content = '' ) {
 	global $content_width;
 	$post_id = get_post() ? get_the_ID() : 0;
 	static $instance = 0;
 	$instance++;
 	/**
-	 * Filter the default video shortcode output.
+	 * Filters the default video shortcode output.
 	 *
 	 * If the filtered output isn't empty, it will be used instead of generating
 	 * the default video template.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @see wp_video_shortcode()
 	 *
 	 * @param string $html     Empty variable to be replaced with shortcode markup.
-	 * @param array  $attr     Attributes of the video shortcode.
+	 * @param array  $attr     Attributes of the shortcode. @see wp_video_shortcode()
 	 * @param string $content  Video shortcode content.
 	 * @param int    $instance Unique numeric ID of this video shortcode instance.
 	 */
 	$override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instance );
 	if ( '' !== $override ) {
 		'loop'     => '',
 		'autoplay' => '',
 		'preload'  => 'metadata',
 		'width'    => 640,
 		'height'   => 360,
+		'class'    => 'wp-video-shortcode',
 	);
 	foreach ( $default_types as $type ) {
 		$defaults_atts[$type] = '';
 	}
 				return sprintf( '<a class="wp-embedded-video" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
 			}
 		}
 		if ( $is_vimeo ) {
-			wp_enqueue_script( 'froogaloop' );
+		    wp_enqueue_script( 'mediaelement-vimeo' );
 		}
 		$primary = true;
 		array_unshift( $default_types, 'src' );
 	} else {
 		array_unshift( $default_types, 'src' );
 	}
 	/**
-	 * Filter the media library used for the video shortcode.
+	 * Filters the media library used for the video shortcode.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param string $library Media library used for the video shortcode.
 	 */
 	$library = apply_filters( 'wp_video_shortcode_library', 'mediaelement' );
 	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
 		wp_enqueue_style( 'wp-mediaelement' );
 		wp_enqueue_script( 'wp-mediaelement' );
-	}
+		wp_enqueue_script( 'mediaelement-vimeo' );
+	}
-	/**
-	 * Filter the class attribute for the video shortcode output container.
+	// Mediaelement has issues with some URL formats for Vimeo and YouTube, so
+	// update the URL to prevent the ME.js player from breaking.
+	if ( 'mediaelement' === $library ) {
+		if ( $is_youtube ) {
+			// Remove `feature` query arg and force SSL - see #40866.
+			$atts['src'] = remove_query_arg( 'feature', $atts['src'] );
+			$atts['src'] = set_url_scheme( $atts['src'], 'https' );
+		} elseif ( $is_vimeo ) {
+			// Remove all query arguments and force SSL - see #40866.
+			$parsed_vimeo_url = wp_parse_url( $atts['src'] );
+			$vimeo_src = 'https://' . $parsed_vimeo_url['host'] . $parsed_vimeo_url['path'];
+			// Add loop param for mejs bug - see #40977, not needed after #39686.
+			$loop = $atts['loop'] ? '1' : '0';
+			$atts['src'] = add_query_arg( 'loop', $loop, $vimeo_src );
+		}
+	}
+	/**
+	 * Filters the class attribute for the video shortcode output container.
 	 *
 	 * @since 3.6.0
+	 * @since 4.9.0 The `$atts` parameter was added.
 	 *
 	 * @param string $class CSS class or list of space-separated classes.
-	 */
+	 * @param array  $atts  Array of video shortcode attributes.
+	 */
+	$atts['class'] = apply_filters( 'wp_video_shortcode_class', $atts['class'], $atts );
 	$html_atts = array(
-		'class'    => apply_filters( 'wp_video_shortcode_class', 'wp-video-shortcode' ),
+		'class'    => $atts['class'],
 		'id'       => sprintf( 'video-%d-%d', $post_id, $instance ),
 		'width'    => absint( $atts['width'] ),
 		'height'   => absint( $atts['height'] ),
 		'poster'   => esc_url( $atts['poster'] ),
 		'loop'     => wp_validate_boolean( $atts['loop'] ),
 	}
 	$html .= '</video>';
 	$width_rule = '';
 	if ( ! empty( $atts['width'] ) ) {
-		$width_rule = sprintf( 'width: %dpx; ', $atts['width'] );
+		$width_rule = sprintf( 'width: %dpx;', $atts['width'] );
 	}
 	$output = sprintf( '<div style="%s" class="wp-video">%s</div>', $width_rule, $html );
 	/**
-	 * Filter the output of the video shortcode.
+	 * Filters the output of the video shortcode.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param string $output  Video shortcode HTML output.
 	 * @param array  $atts    Array of video shortcode attributes.
 *
 * @since 2.5.0
 *
 * @see adjacent_image_link()
 *
-* @param string|array $size Optional. Registered image size or flat array of height and width dimensions.
+* @param string|array $size Optional. Image size. Accepts any valid image size, an array of width and
-*                           0 or 'none' will default to 'post_title' or `$text`. Default 'thumbnail'.
+*                           height values in pixels (in that order), 0, or 'none'. 0 or 'none' will
+*                           default to 'post_title' or `$text`. Default 'thumbnail'.
 * @param string       $text Optional. Link text. Default false.
-* @return string HTML output for the previous image link.
 */
 function previous_image_link( $size = 'thumbnail', $text = false ) {
 	adjacent_image_link(true, $size, $text);
 }
 *
 * @since 2.5.0
 *
 * @see adjacent_image_link()
 *
-* @param string|array $size Optional. Registered image size or flat array of height and width dimensions.
+* @param string|array $size Optional. Image size. Accepts any valid image size, an array of width and
-*                           0 or 'none' will default to 'post_title' or `$text`. Default 'thumbnail'.
+*                           height values in pixels (in that order), 0, or 'none'. 0 or 'none' will
+*                           default to 'post_title' or `$text`. Default 'thumbnail'.
 * @param string       $text Optional. Link text. Default false.
-* @return string HTML output for the next image link.
+*/
-*/
+function next_image_link( $size = 'thumbnail', $text = false ) {
-function next_image_link($size = 'thumbnail', $text = false) {
 	adjacent_image_link(false, $size, $text);
 }
 /**
 * Displays next or previous image link that has the same post parent.
 * Retrieves the current attachment object from the $post global.
 *
 * @since 2.5.0
 *
 * @param bool         $prev Optional. Whether to display the next (false) or previous (true) link. Default true.
-* @param string|array $size Optional. Registered image size or flat array of height and width dimensions.
+* @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width and height
-*                                     Default 'thumbnail'.
+*                           values in pixels (in that order). Default 'thumbnail'.
 * @param bool         $text Optional. Link text. Default false.
-* @return string The adjacent image link.
 */
 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' ) ) );
 	}
 	$adjacent = $prev ? 'previous' : 'next';
 	/**
-	 * Filter the adjacent image link.
+	 * Filters the adjacent image link.
 	 *
 	 * The dynamic portion of the hook name, `$adjacent`, refers to the type of adjacency,
 	 * either 'next', or 'previous'.
 	 *
 	 * @since 3.5.0
 /**
 * Retrieves taxonomies attached to given the attachment.
 *
 * @since 2.5.0
+* @since 4.7.0 Introduced the `$output` parameter.
 *
 * @param int|array|object $attachment Attachment ID, data array, or data object.
+* @param string           $output     Output type. 'names' to return an array of taxonomy names,
+*                                     or 'objects' to return an array of taxonomy objects.
+*                                     Default is 'names'.
 * @return array Empty array on failure. List of taxonomies on success.
 */
-function get_attachment_taxonomies( $attachment ) {
+function get_attachment_taxonomies( $attachment, $output = 'names' ) {
 	if ( is_int( $attachment ) ) {
 		$attachment = get_post( $attachment );
 	} elseif ( is_array( $attachment ) ) {
 		$attachment = (object) $attachment;
 	}
 	if ( ! is_object($attachment) )
 		return array();
-	$filename = basename($attachment->guid);
+	$file = get_attached_file( $attachment->ID );
+	$filename = basename( $file );
 	$objects = array('attachment');
 	if ( false !== strpos($filename, '.') )
 		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
 				if ( !empty($token) )
 					$objects[] = "attachment:$token";
 	}
 	$taxonomies = array();
-	foreach ( $objects as $object )
+	foreach ( $objects as $object ) {
-		if ( $taxes = get_object_taxonomies($object) )
+		if ( $taxes = get_object_taxonomies( $object, $output ) ) {
-			$taxonomies = array_merge($taxonomies, $taxes);
+			$taxonomies = array_merge( $taxonomies, $taxes );
+		}
-	return array_unique($taxonomies);
+	}
+	if ( 'names' === $output ) {
+		$taxonomies = array_unique( $taxonomies );
+	}
+	return $taxonomies;
 }
 /**
 * Retrieves all of the taxonomy names that are registered for attachments.
 *
 	}
 	return $img;
 }
 /**
-* Registers an embed handler.
-*
-* Should probably only be used for sites that do not support oEmbed.
-*
-* @since 2.9.0
-*
-* @see WP_Embed::register_handler()
-*
-* @param string   $id       An internal ID/name for the handler. Needs to be unique.
-* @param string   $regex    The regex that will be used to see if this handler should be used for a URL.
-* @param callback $callback The callback function that will be called if the regex is matched.
-* @param int      $priority Optional. Used to specify the order in which the registered handlers will
-*                           be tested. Default 10.
-*/
-function wp_embed_register_handler( $id, $regex, $callback, $priority = 10 ) {
-	global $wp_embed;
-	$wp_embed->register_handler( $id, $regex, $callback, $priority );
-}
-/**
-* Unregisters a previously-registered embed handler.
-*
-* @since 2.9.0
-*
-* @see WP_Embed::unregister_handler()
-*
-* @param string $id       The handler ID that should be removed.
-* @param int    $priority Optional. The priority of the handler to be removed. Default 10.
-*/
-function wp_embed_unregister_handler( $id, $priority = 10 ) {
-	global $wp_embed;
-	$wp_embed->unregister_handler( $id, $priority );
-}
-/**
-* Create default array of embed parameters.
-*
-* The width defaults to the content width as specified by the theme. If the
-* theme does not specify a content width, then 500px is used.
-*
-* The default height is 1.5 times the width, or 1000px, whichever is smaller.
-*
-* The 'embed_defaults' filter can be used to adjust either of these values.
-*
-* @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( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
-		$width = (int) $GLOBALS['content_width'];
-	if ( empty( $width ) )
-		$width = 500;
-	$height = min( ceil( $width * 1.5 ), 1000 );
-	/**
-	 * Filter the default array of embed dimensions.
-	 *
-	 * @since 2.9.0
-	 *
-	 * @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' ), $url );
-}
-/**
 * Based on a supplied width/height example, return the biggest possible dimensions based on the max width/height.
 *
 * @since 2.9.0
 *
 * @see wp_constrain_dimensions()
 	return wp_constrain_dimensions( $example_width * 1000000, $example_height * 1000000, $max_width, $max_height );
 }
 /**
-* Attempts to fetch the embed HTML for a provided URL using oEmbed.
-*
-* @since 2.9.0
-*
-* @see WP_oEmbed
-*
-* @param string $url  The URL that should be embedded.
-* @param array  $args Optional. Additional arguments and parameters for retrieving embed HTML.
-*                     Default empty.
-* @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' );
-	$oembed = _wp_oembed_get_object();
-	return $oembed->get_html( $url, $args );
-}
-/**
-* Adds a URL format and oEmbed provider URL pair.
-*
-* @since 2.9.0
-*
-* @see WP_oEmbed
-*
-* @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    Optional. Whether the `$format` parameter is in a RegEx format. Default false.
-*/
-function wp_oembed_add_provider( $format, $provider, $regex = false ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
-	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 );
-	}
-}
-/**
-* Removes an oEmbed provider.
-*
-* @since 3.5.0
-*
-* @see WP_oEmbed
-*
-* @param string $format The URL format for the oEmbed provider to remove.
-* @return bool Was the provider removed successfully?
-*/
-function wp_oembed_remove_provider( $format ) {
-	require_once( ABSPATH . WPINC . '/class-oembed.php' );
-	if ( did_action( 'plugins_loaded' ) ) {
-		$oembed = _wp_oembed_get_object();
-		if ( isset( $oembed->providers[ $format ] ) ) {
-			unset( $oembed->providers[ $format ] );
-			return true;
-		}
-	} else {
-		WP_oEmbed::_remove_provider_early( $format );
-	}
-	return false;
-}
-/**
-* 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
-*
-* @see wp_embed_register_handler()
-*/
-function wp_maybe_load_embeds() {
-	/**
-	 * Filter whether to load the default embed handlers.
-	 *
-	 * Returning a falsey value will prevent loading the default embed handlers.
-	 *
-	 * @since 2.9.0
-	 *
-	 * @param bool $maybe_load_embeds Whether to load the embeds library. Default true.
-	 */
-	if ( ! apply_filters( 'load_default_embeds', true ) ) {
-		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' );
-	/**
-	 * Filter the audio embed handler callback.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param callback $handler Audio embed handler callback function.
-	 */
-	wp_embed_register_handler( 'audio', '#^https?://.+?\.(' . join( '|', wp_get_audio_extensions() ) . ')$#i', apply_filters( 'wp_audio_embed_handler', 'wp_embed_handler_audio' ), 9999 );
-	/**
-	 * Filter the video embed handler callback.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param callback $handler Video embed handler callback function.
-	 */
-	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'] );
-	}
-	/**
-	 * Filter 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.
-*
-* @since 4.0.0
-*
-* @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_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.
-*
-* @since 3.6.0
-*
-* @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_audio( $matches, $attr, $url, $rawattr ) {
-	$audio = sprintf( '[audio src="%s" /]', esc_url( $url ) );
-	/**
-	 * Filter the audio embed output.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $audio   Audio 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_audio', $audio, $attr, $url, $rawattr );
-}
-/**
-* Video embed handler callback.
-*
-* @since 3.6.0
-*
-* @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_video( $matches, $attr, $url, $rawattr ) {
-	$dimensions = '';
-	if ( ! empty( $rawattr['width'] ) && ! empty( $rawattr['height'] ) ) {
-		$dimensions .= sprintf( 'width="%d" ', (int) $rawattr['width'] );
-		$dimensions .= sprintf( 'height="%d" ', (int) $rawattr['height'] );
-	}
-	$video = sprintf( '[video %s src="%s" /]', $dimensions, esc_url( $url ) );
-	/**
-	 * Filter the video embed output.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param string $video   Video 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_video', $video, $attr, $url, $rawattr );
-}
-/**
-* Converts a shorthand byte value to an integer byte value.
-*
-* @since 2.3.0
-*
-* @param string $size A shorthand byte value.
-* @return int An integer byte value.
-*/
-function wp_convert_hr_to_bytes( $size ) {
-	$size  = strtolower( $size );
-	$bytes = (int) $size;
-	if ( strpos( $size, 'k' ) !== false )
-		$bytes = intval( $size ) * 1024;
-	elseif ( strpos( $size, 'm' ) !== false )
-		$bytes = intval($size) * 1024 * 1024;
-	elseif ( strpos( $size, 'g' ) !== false )
-		$bytes = intval( $size ) * 1024 * 1024 * 1024;
-	return $bytes;
-}
-/**
 * Determines the maximum upload size allowed in php.ini.
 *
 * @since 2.5.0
 *
 * @return int Allowed upload size.
 function wp_max_upload_size() {
 	$u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) );
 	$p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) );
 	/**
-	 * Filter the maximum upload size allowed in php.ini.
+	 * Filters the maximum upload size allowed in php.ini.
 	 *
 	 * @since 2.5.0
 	 *
 	 * @param int $size    Max upload size limit in bytes.
 	 * @param int $u_bytes Maximum upload filesize in bytes.
 *
 * @ignore
 * @since 3.5.0
 *
 * @param array $args Optional. Array of arguments for choosing a capable editor. Default empty array.
-* @return string|bool Class name for the first editor that claims to support the request. False if no
+* @return string|false Class name for the first editor that claims to support the request. False if no
 *                     editor claims to support the request.
 */
 function _wp_image_editor_choose( $args = array() ) {
 	require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
 	require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
 	require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
+	/**
-	/**
+	 * Filters the list of image editing library classes.
-	 * Filter the list of image editing library classes.
 	 *
 	 * @since 3.5.0
 	 *
 	 * @param array $image_editors List of available image editors. Defaults are
 	 *                             'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD'.
 	return false;
 }
 /**
-* Prints default plupload arguments.
+* Prints default Plupload arguments.
 *
 * @since 3.4.0
 */
 function wp_plupload_default_settings() {
-	global $wp_scripts;
+	$wp_scripts = wp_scripts();
 	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
 	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
 		return;
 	$max_upload_size = wp_max_upload_size();
+	$allowed_extensions = array_keys( get_allowed_mime_types() );
+	$extensions = array();
+	foreach ( $allowed_extensions as $extension ) {
+		$extensions = array_merge( $extensions, explode( '|', $extension ) );
+	}
+	/*
+	 * Since 4.9 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
+	 * and the `flash_swf_url` and `silverlight_xap_url` are not used.
+	 */
 	$defaults = array(
-		'runtimes'            => 'html5,flash,silverlight,html4',
 		'file_data_name'      => 'async-upload', // key passed to $_FILE.
 		'url'                 => admin_url( 'async-upload.php', 'relative' ),
-		'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
-		'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
 		'filters' => array(
 			'max_file_size'   => $max_upload_size . 'b',
+			'mime_types'      => array( array( 'extensions' => implode( ',', $extensions ) ) ),
 		),
 	);
 	// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
 	// when enabled. See #29602.
 		$defaults['multi_selection'] = false;
 	}
 	/**
-	 * Filter the Plupload default settings.
+	 * Filters the Plupload default settings.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param array $defaults Default Plupload settings array.
 	 */
 	$params = array(
 		'action' => 'upload-attachment',
 	);
 	/**
-	 * Filter the Plupload default parameters.
+	 * Filters the Plupload default parameters.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param array $params Default Plupload parameters array.
 	 */
 * to be JSON-encoded and fit into an Attachment model.
 *
 * @since 3.5.0
 *
 * @param mixed $attachment Attachment ID or object.
-* @return array Array of attachment details.
+* @return array|void Array of attachment details.
 */
 function wp_prepare_attachment_for_js( $attachment ) {
 	if ( ! $attachment = get_post( $attachment ) )
 		return;
 		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 	else
 		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
 	$attachment_url = wp_get_attachment_url( $attachment->ID );
+	$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
 	$response = array(
 		'id'          => $attachment->ID,
 		'title'       => $attachment->post_title,
-		'filename'    => wp_basename( $attachment->guid ),
+		'filename'    => wp_basename( get_attached_file( $attachment->ID ) ),
 		'url'         => $attachment_url,
 		'link'        => get_attachment_link( $attachment->ID ),
 		'alt'         => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
 		'author'      => $attachment->post_author,
 		'description' => $attachment->post_content,
 		'menuOrder'   => $attachment->menu_order,
 		'mime'        => $attachment->post_mime_type,
 		'type'        => $type,
 		'subtype'     => $subtype,
 		'icon'        => wp_mime_type_icon( $attachment->ID ),
-		'dateFormatted' => mysql2date( get_option('date_format'), $attachment->post_date ),
+		'dateFormatted' => mysql2date( __( 'F j, Y' ), $attachment->post_date ),
 		'nonces'      => array(
 			'update' => false,
 			'delete' => false,
 			'edit'   => false
 		),
 		'editLink'   => false,
 		'meta'       => false,
 	);
 	$author = new WP_User( $attachment->post_author );
-	$response['authorName'] = $author->display_name;
+	if ( $author->exists() ) {
+		$response['authorName'] = html_entity_decode( $author->display_name, ENT_QUOTES, get_bloginfo( 'charset' ) );
+	} else {
+		$response['authorName'] = __( '(no author)' );
+	}
 	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)' );
+		if ( $parent_type && current_user_can( 'read_post', $attachment->post_parent ) ) {
+			$response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
+		}
 	}
 	$attached_file = get_attached_file( $attachment->ID );
-	if ( file_exists( $attached_file ) ) {
+	if ( isset( $meta['filesize'] ) ) {
+		$bytes = $meta['filesize'];
+	} elseif ( file_exists( $attached_file ) ) {
 		$bytes = filesize( $attached_file );
+	} else {
+		$bytes = '';
+	}
+	if ( $bytes ) {
 		$response['filesizeInBytes'] = $bytes;
 		$response['filesizeHumanReadable'] = size_format( $bytes );
 	}
+	$context = get_post_meta( $attachment->ID, '_wp_attachment_context', true );
+	$response['context'] = ( $context ) ? $context : '';
 	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 );
 		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
 	}
 	if ( current_user_can( 'delete_post', $attachment->ID ) )
 		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
-	if ( $meta && 'image' === $type ) {
+	if ( $meta && ( 'image' === $type || ! empty( $meta['sizes'] ) ) ) {
 		$sizes = array();
 		/** This filter is documented in wp-admin/includes/media.php */
 		$possible_sizes = apply_filters( 'image_size_names_choose', array(
 			'thumbnail' => __('Thumbnail'),
 		// way to check the image metadata, which we do second.
 		foreach ( $possible_sizes as $size => $label ) {
 			/** This filter is documented in wp-includes/media.php */
 			if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
-				if ( ! $downsize[3] )
+				if ( empty( $downsize[3] ) ) {
 					continue;
+				}
 				$sizes[ $size ] = array(
 					'height'      => $downsize[2],
 					'width'       => $downsize[1],
 					'url'         => $downsize[0],
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
 			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
 				// Nothing from the filter, so consult image metadata if we have it.
 				$size_meta = $meta['sizes'][ $size ];
 				// We have the actual image size, but might need to further constrain it if content_width is narrower.
 				// Thumbnail, medium, and full sizes are also checked against the site's height/width options.
 					'orientation' => $height > $width ? 'portrait' : 'landscape',
 				);
 			}
 		}
-		$sizes['full'] = array( 'url' => $attachment_url );
+		if ( 'image' === $type ) {
+			$sizes['full'] = array( 'url' => $attachment_url );
-		if ( isset( $meta['height'], $meta['width'] ) ) {
-			$sizes['full']['height'] = $meta['height'];
+			if ( isset( $meta['height'], $meta['width'] ) ) {
-			$sizes['full']['width'] = $meta['width'];
+				$sizes['full']['height'] = $meta['height'];
-			$sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
+				$sizes['full']['width'] = $meta['width'];
-		}
+				$sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
+			}
-		$response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
-	} elseif ( $meta && 'video' === $type ) {
+			$response = array_merge( $response, $sizes['full'] );
+		} elseif ( $meta['sizes']['full']['file'] ) {
+			$sizes['full'] = array(
+				'url'         => $base_url . $meta['sizes']['full']['file'],
+				'height'      => $meta['sizes']['full']['height'],
+				'width'       => $meta['sizes']['full']['width'],
+				'orientation' => $meta['sizes']['full']['height'] > $meta['sizes']['full']['width'] ? 'portrait' : 'landscape'
+			);
+		}
+		$response = array_merge( $response, array( 'sizes' => $sizes ) );
+	}
+	if ( $meta && 'video' === $type ) {
 		if ( isset( $meta['width'] ) )
 			$response['width'] = (int) $meta['width'];
 		if ( isset( $meta['height'] ) )
 			$response['height'] = (int) $meta['height'];
 	}
 	if ( function_exists('get_compat_media_markup') )
 		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
 	/**
-	 * Filter the attachment data prepared for JavaScript.
+	 * Filters the attachment data prepared for JavaScript.
 	 *
 	 * @since 3.5.0
 	 *
 	 * @param array      $response   Array of prepared attachment data.
 	 * @param int|object $attachment Attachment ID or object.
 * Enqueues all scripts, styles, settings, and templates necessary to use
 * all media JS APIs.
 *
 * @since 3.5.0
 *
+* @global int       $content_width
+* @global wpdb      $wpdb
+* @global WP_Locale $wp_locale
+*
 * @param array $args {
 *     Arguments for enqueuing media scripts.
 *
 *     @type int|WP_Post A post object or ID.
 * }
-* @return array List of media view settings.
 */
 function wp_enqueue_media( $args = array() ) {
 	// Enqueue me just once per page, please.
 	if ( did_action( 'wp_enqueue_media' ) )
 		return;
 	global $content_width, $wpdb, $wp_locale;
 				break;
 			}
 		}
 	}
-	$has_audio = $wpdb->get_var( "
+	/**
-		SELECT ID
+	 * Allows showing or hiding the "Create Audio Playlist" button in the media library.
-		FROM $wpdb->posts
+	 *
-		WHERE post_type = 'attachment'
+	 * By default, the "Create Audio Playlist" button will always be shown in
-		AND post_mime_type LIKE 'audio%'
+	 * the media library.  If this filter returns `null`, a query will be run
-		LIMIT 1
+	 * to determine whether the media library contains any audio items.  This
-	" );
+	 * was the default behavior prior to version 4.8.0, but this query is
-	$has_video = $wpdb->get_var( "
+	 * expensive for large media libraries.
-		SELECT ID
+	 *
-		FROM $wpdb->posts
+	 * @since 4.7.4
-		WHERE post_type = 'attachment'
+	 * @since 4.8.0 The filter's default value is `true` rather than `null`.
-		AND post_mime_type LIKE 'video%'
+	 *
-		LIMIT 1
+	 * @link https://core.trac.wordpress.org/ticket/31071
-	" );
+	 *
-	$months = $wpdb->get_results( $wpdb->prepare( "
+	 * @param bool|null Whether to show the button, or `null` to decide based
-		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+	 *                  on whether any audio files exist in the media library.
-		FROM $wpdb->posts
+	 */
-		WHERE post_type = %s
+	$show_audio_playlist = apply_filters( 'media_library_show_audio_playlist', true );
-		ORDER BY post_date DESC
+	if ( null === $show_audio_playlist ) {
-	", 'attachment' ) );
+		$show_audio_playlist = $wpdb->get_var( "
+			SELECT ID
+			FROM $wpdb->posts
+			WHERE post_type = 'attachment'
+			AND post_mime_type LIKE 'audio%'
+			LIMIT 1
+		" );
+	}
+	/**
+	 * Allows showing or hiding the "Create Video Playlist" button in the media library.
+	 *
+	 * By default, the "Create Video Playlist" button will always be shown in
+	 * the media library.  If this filter returns `null`, a query will be run
+	 * to determine whether the media library contains any video items.  This
+	 * was the default behavior prior to version 4.8.0, but this query is
+	 * expensive for large media libraries.
+	 *
+	 * @since 4.7.4
+	 * @since 4.8.0 The filter's default value is `true` rather than `null`.
+	 *
+	 * @link https://core.trac.wordpress.org/ticket/31071
+	 *
+	 * @param bool|null Whether to show the button, or `null` to decide based
+	 *                  on whether any video files exist in the media library.
+	 */
+	$show_video_playlist = apply_filters( 'media_library_show_video_playlist', true );
+	if ( null === $show_video_playlist ) {
+		$show_video_playlist = $wpdb->get_var( "
+			SELECT ID
+			FROM $wpdb->posts
+			WHERE post_type = 'attachment'
+			AND post_mime_type LIKE 'video%'
+			LIMIT 1
+		" );
+	}
+	/**
+	 * Allows overriding the list of months displayed in the media library.
+	 *
+	 * By default (if this filter does not return an array), a query will be
+	 * run to determine the months that have media items.  This query can be
+	 * expensive for large media libraries, so it may be desirable for sites to
+	 * override this behavior.
+	 *
+	 * @since 4.7.4
+	 *
+	 * @link https://core.trac.wordpress.org/ticket/31071
+	 *
+	 * @param array|null An array of objects with `month` and `year`
+	 *                   properties, or `null` (or any other non-array value)
+	 *                   for default behavior.
+	 */
+	$months = apply_filters( 'media_library_months_with_files', null );
+	if ( ! is_array( $months ) ) {
+		$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(
 		'post'    => array(
 			'id' => 0,
 		),
 		'defaultProps' => $props,
 		'attachmentCounts' => array(
-			'audio' => ( $has_audio ) ? 1 : 0,
+			'audio' => ( $show_audio_playlist ) ? 1 : 0,
-			'video' => ( $has_video ) ? 1 : 0
+			'video' => ( $show_video_playlist ) ? 1 : 0,
 		),
+		'oEmbedProxyUrl' => rest_url( 'oembed/1.0/proxy' ),
 		'embedExts'    => $exts,
 		'embedMimes'   => $ext_mimes,
 		'contentWidth' => $content_width,
 		'months'       => $months,
-		'mediaTrash'   => MEDIA_TRASH ? 1 : 0
+		'mediaTrash'   => MEDIA_TRASH ? 1 : 0,
 	);
 	$post = null;
 	if ( isset( $args['post'] ) ) {
 		$post = get_post( $args['post'] );
 			$featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
 			$settings['post']['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
 		}
 	}
-	$hier = $post && is_post_type_hierarchical( $post->post_type );
+	if ( $post ) {
+		$post_type_object = get_post_type_object( $post->post_type );
+	} else {
+		$post_type_object = get_post_type_object( 'post' );
+	}
 	$strings = array(
 		// Generic
 		'url'         => __( 'URL' ),
 		'addMedia'    => __( 'Add Media' ),
 		'uploadFilesTitle'  => __( 'Upload Files' ),
 		'uploadImagesTitle' => __( 'Upload Images' ),
 		// Library
 		'mediaLibraryTitle'      => __( 'Media Library' ),
-		'insertMediaTitle'       => __( 'Insert Media' ),
+		'insertMediaTitle'       => __( 'Add Media' ),
 		'createNewGallery'       => __( 'Create a new gallery' ),
 		'createNewPlaylist'      => __( 'Create a new playlist' ),
 		'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
 		'returnToLibrary'        => __( '&#8592; Return to library' ),
 		'allMediaItems'          => __( 'All media items' ),
 		'allDates'               => __( 'All dates' ),
 		'noItemsFound'           => __( 'No items found.' ),
-		'insertIntoPost'         => $hier ? __( 'Insert into page' ) : __( 'Insert into post' ),
+		'insertIntoPost'         => $post_type_object->labels->insert_into_item,
 		'unattached'             => __( 'Unattached' ),
+		'mine'                   => _x( 'Mine', 'media items' ),
 		'trash'                  => _x( 'Trash', 'noun' ),
-		'uploadedToThisPost'     => $hier ? __( 'Uploaded to this page' ) : __( 'Uploaded to this post' ),
+		'uploadedToThisPost'     => $post_type_object->labels->uploaded_to_this_item,
-		'warnDelete'             => __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),
+		'warnDelete'             => __( "You are about to permanently delete this item from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkDelete'         => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
+		'warnBulkDelete'         => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\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' ),
 		'deletePermanently'      => __( 'Delete Permanently' ),
 		'apply'                  => __( 'Apply' ),
 		'filterByDate'           => __( 'Filter by date' ),
 		'filterByType'           => __( 'Filter by type' ),
 		'searchMediaLabel'       => __( 'Search Media' ),
-		'noMedia'                => __( 'No media attachments found.' ),
+		'searchMediaPlaceholder' => __( 'Search media items...' ), // placeholder (no ellipsis)
+		'noMedia'                => __( 'No media files found.' ),
 		// Library Details
 		'attachmentDetails'  => __( 'Attachment Details' ),
 		// From URL
 		'insertFromUrlTitle' => __( 'Insert from URL' ),
 		// Featured Images
-		'setFeaturedImageTitle' => __( 'Set Featured Image' ),
+		'setFeaturedImageTitle' => $post_type_object->labels->featured_image,
-		'setFeaturedImage'    => __( 'Set featured image' ),
+		'setFeaturedImage'      => $post_type_object->labels->set_featured_image,
 		// Gallery
 		'createGalleryTitle' => __( 'Create Gallery' ),
 		'editGalleryTitle'   => __( 'Edit Gallery' ),
 		'cancelGalleryTitle' => __( '&#8592; Cancel Gallery' ),
 		'selectAndCrop' => __( 'Select and Crop' ),
 		'skipCropping' => __( 'Skip Cropping' ),
 		'cropImage' => __( 'Crop Image' ),
 		'cropYourImage' => __( 'Crop your image' ),
 		'cropping' => __( 'Cropping&hellip;' ),
-		'suggestedDimensions' => __( 'Suggested image dimensions:' ),
+		/* translators: 1: suggested width number, 2: suggested height number. */
+		'suggestedDimensions' => __( 'Suggested image dimensions: %1$s by %2$s pixels.' ),
 		'cropError' => __( 'There has been an error cropping your image.' ),
 		// Edit Audio
 		'audioDetailsTitle'     => __( 'Audio Details' ),
 		'audioReplaceTitle'     => __( 'Replace Audio' ),
 		'addToVideoPlaylist'       => __( 'Add to video playlist' ),
 		'addToVideoPlaylistTitle'  => __( 'Add to Video Playlist' ),
 	);
 	/**
-	 * Filter the media view settings.
+	 * Filters the media view settings.
 	 *
 	 * @since 3.5.0
 	 *
 	 * @param array   $settings List of media view settings.
 	 * @param WP_Post $post     Post object.
 	 */
 	$settings = apply_filters( 'media_view_settings', $settings, $post );
 	/**
-	 * Filter the media view strings.
+	 * Filters the media view strings.
 	 *
 	 * @since 3.5.0
 	 *
 	 * @param array   $strings List of media view strings.
 	 * @param WP_Post $post    Post object.
 		'orderby' => 'menu_order',
 		'order' => 'ASC',
 	);
 	/**
-	 * Filter arguments used to retrieve media attached to the given post.
+	 * Filters arguments used to retrieve media attached to the given post.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param array  $args Post query arguments.
 	 * @param string $type Mime type of the desired media.
 	$args = apply_filters( 'get_attached_media_args', $args, $type, $post );
 	$children = get_children( $args );
 	/**
-	 * Filter the list of media attached to the given post.
+	 * Filters the list of media attached to the given post.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param array  $children Associative array of media attached to the given post.
 	 * @param string $type     Mime type of the media desired.
 */
 function get_media_embedded_in_content( $content, $types = null ) {
 	$html = array();
 	/**
-	 * Filter the embedded media types that are allowed to be returned from the content blob.
+	 * Filters the embedded media types that are allowed to be returned from the content blob.
 	 *
 	 * @since 4.2.0
 	 *
 	 * @param array $allowed_media_types An array of allowed media types. Default media types are
 	 *                                   'audio', 'video', 'object', 'embed', and 'iframe'.
 	$galleries = array();
 	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
 		foreach ( $matches as $shortcode ) {
 			if ( 'gallery' === $shortcode[2] ) {
 				$srcs = array();
+				$shortcode_attrs = shortcode_parse_atts( $shortcode[3] );
+				if ( ! is_array( $shortcode_attrs ) ) {
+					$shortcode_attrs = array();
+				}
+				// Specify the post id of the gallery we're viewing if the shortcode doesn't reference another post already.
+				if ( ! isset( $shortcode_attrs['id'] ) ) {
+					$shortcode[3] .= ' id="' . intval( $post->ID ) . '"';
+				}
 				$gallery = do_shortcode_tag( $shortcode );
 				if ( $html ) {
 					$galleries[] = $gallery;
 				} else {
 					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
 					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
+						foreach ( $src as $s ) {
 							$srcs[] = $s[2];
+						}
 					}
-					$data = shortcode_parse_atts( $shortcode[3] );
+					$galleries[] = array_merge(
-					$data['src'] = array_values( array_unique( $srcs ) );
+						$shortcode_attrs,
-					$galleries[] = $data;
+						array(
+							'src' => array_values( array_unique( $srcs ) )
+						)
+					);
 				}
 			}
 		}
 	}
 	/**
-	 * Filter the list of all found galleries in the given post.
+	 * Filters the list of all found galleries in the given post.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param array   $galleries Associative array of all found post galleries.
 	 * @param WP_Post $post      Post object.
 function get_post_gallery( $post = 0, $html = true ) {
 	$galleries = get_post_galleries( $post, $html );
 	$gallery = reset( $galleries );
 	/**
-	 * Filter the first-found post gallery.
+	 * Filters the first-found post gallery.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @param array       $gallery   The first-found post gallery.
 	 * @param int|WP_Post $post      Post ID or object.
 * @return int The found post ID, or 0 on failure.
 */
 function attachment_url_to_postid( $url ) {
 	global $wpdb;
-	$dir = wp_upload_dir();
+	$dir = wp_get_upload_dir();
 	$path = $url;
+	$site_url = parse_url( $dir['url'] );
+	$image_path = parse_url( $path );
+	//force the protocols to match if needed
+	if ( isset( $image_path['scheme'] ) && ( $image_path['scheme'] !== $site_url['scheme'] ) ) {
+		$path = str_replace( $image_path['scheme'], $site_url['scheme'], $path );
+	}
 	if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) {
 		$path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
 	}
 		$path
 	);
 	$post_id = $wpdb->get_var( $sql );
 	/**
-	 * Filter an attachment id found by URL.
+	 * Filters an attachment id found by URL.
 	 *
 	 * @since 4.2.0
 	 *
 	 * @param int|null $post_id The post_id (if any) found by the function.
 	 * @param string   $url     The URL being looked up.
 	 */
-	$post_id = apply_filters( 'attachment_url_to_postid', $post_id, $url );
+	return (int) apply_filters( 'attachment_url_to_postid', $post_id, $url );
-	return (int) $post_id;
 }
 /**
 * Returns the URLs for CSS files used in an iframe-sandbox'd TinyMCE media view.
 *
 * @since 4.0.0
 *
-* @global $wp_version
-*
 * @return array The relevant CSS file URLs.
 */
 function wpview_media_sandbox_styles() {
-	$version = 'ver=' . $GLOBALS['wp_version'];
+	$version = 'ver=' . get_bloginfo( 'version' );
-	$mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
+	$mediaelement = includes_url( "js/mediaelement/mediaelementplayer-legacy.min.css?$version" );
 	$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
 	return array( $mediaelement, $wpmediaelement );
 }
+/**
+* Registers the personal data exporter for media
+*
+* @param array   $exporters   An array of personal data exporters.
+* @return array  An array of personal data exporters.
+*/
+function wp_register_media_personal_data_exporter( $exporters ) {
+	$exporters['wordpress-media'] = array(
+		'exporter_friendly_name' => __( 'WordPress Media' ),
+		'callback'               => 'wp_media_personal_data_exporter',
+	);
+	return $exporters;
+}
+/**
+* Finds and exports attachments associated with an email address.
+*
+* @since 4.9.6
+*
+* @param  string $email_address The attachment owner email address.
+* @param  int    $page          Attachment page.
+* @return array  $return        An array of personal data.
+*/
+function wp_media_personal_data_exporter( $email_address, $page = 1 ) {
+	// Limit us to 50 attachments at a time to avoid timing out.
+	$number = 50;
+	$page   = (int) $page;
+	$data_to_export = array();
+	$user = get_user_by( 'email' , $email_address );
+	if ( false === $user ) {
+		return array(
+			'data' => $data_to_export,
+			'done' => true,
+		);
+	}
+	$post_query = new WP_Query(
+		array(
+			'author'         => $user->ID,
+			'posts_per_page' => $number,
+			'paged'          => $page,
+			'post_type'      => 'attachment',
+			'post_status'    => 'any',
+			'orderby'        => 'ID',
+			'order'          => 'ASC',
+		)
+	);
+	foreach ( (array) $post_query->posts as $post ) {
+		$attachment_url = wp_get_attachment_url( $post->ID );
+		if ( $attachment_url ) {
+			$post_data_to_export = array(
+				array( 'name'  => __( 'URL' ), 'value' => $attachment_url ),
+			);
+			$data_to_export[] = array(
+				'group_id'    => 'media',
+				'group_label' => __( 'Media' ),
+				'item_id'     => "post-{$post->ID}",
+				'data'        => $post_data_to_export,
+			);
+		}
+	}
+	$done = $post_query->max_num_pages <= $page;
+	return array(
+		'data' => $data_to_export,
+		'done' => $done,
+	);
+}

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9