WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make wp_prepare_attachment_for_js() compatible with plugins that disable all intermediate image sizes (so no images are created on upload), and then create them on the fly using the image_downsize filter (say, with a URL that can dynamically create images on the fly). 

Props nacin
fixes #22598


git-svn-id: http://core.svn.wordpress.org/trunk@22850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-11-26 22:46:56 +00:00
parent e52a437bc2
commit e4c8ceca1e
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wp-includes/media.php
View File

@ -1331,15 +1331,39 @@ function wp_prepare_attachment_for_js( $attachment ) {
if ( $meta && 'image' === $type ) { if ( $meta && 'image' === $type ) {
$sizes = array(); $sizes = array();
$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url ); $possible_sizes = apply_filters( 'image_size_names_choose', array(
'thumbnail' => __('Thumbnail'),
'medium' => __('Medium'),
'large' => __('Large'),
'full' => __('Full Size'),
) );
unset( $possible_sizes['full'] );
if ( isset( $meta['sizes'] ) ) { // Loop through all potential sizes that may be chosen. Try to do this with some efficiency.
foreach ( $meta['sizes'] as $slug => $size ) { // First: run the image_downsize filter. If it returns something, we can use its data.
$sizes[ $slug ] = array( // If the filter does not return something, then image_downsize() is just an expensive
'height' => $size['height'], // way to check the image metadata, which we do second.
'width' => $size['width'], foreach ( $possible_sizes as $size => $label ) {
'url' => $base_url . $size['file'], if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
'orientation' => $size['height'] > $size['width'] ? 'portrait' : 'landscape', if ( ! $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 ];
$sizes[ $size ] = array(
'height' => $size_meta['height'],
'width' => $size_meta['width'],
'url' => $base_url . $size_meta['file'],
'orientation' => $size_meta['height'] > $size_meta['width'] ? 'portrait' : 'landscape',
); );
} }
} }