Changeset 13145

Timestamp:

02/14/2010 08:21:07 AM (15 years ago)

Author:

markjaquith

Message:

Skip intermediate sizes of a different aspect ratio than the original image when considering which image to use in image_get_intermediate_size(). fixes #12218

File:

• trunk/wp-includes/media.php (modified) (1 diff)

trunk/wp-includes/media.php

@@ -485 +485 @@
                 $data = $imagedata['sizes'][$_size];
                 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
+                    $maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false );
+                    // If the size doesn't match exactly, 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[0] != $data['width'] || $maybe_cropped[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 );