Ticket #34981: 34981.4.diff

src/wp-includes/media.php

@@ -3140 +3140 @@
                 // If the filter does not return something, then image_downsize() is just an expensive
                 // 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] )
@@ -3151 +3150 @@
                                         'url'         => $downsize[0],
                                         'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
                                 );
-                        } elseif ( isset( $meta['sizes'][ $size ] ) ) {
+                        }
+                }
+
+                // If the image_downsize filter didn't return anything, we use the metadata.
+                if ( empty( $sizes ) && isset( $meta['sizes'] ) ) {
+                        foreach( $meta['sizes'] as $size => $size_meta ) {
                                 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.
                                 list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );