Changeset 23264

Timestamp:

01/04/2013 08:52:18 AM (12 years ago)

Author:

nacin

Message:

Media: Pass thumbnail and medium sizes to image_constrain_size_for_editor() to force constraints based on the current DB options for those sizes. History: see #22598, #22738.

props jond3r.
see #23102.
for trunk.

File:

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

trunk/wp-includes/media.php

@@ -1392 +1392 @@
 
                 // We have the actual image size, but might need to further constrain it if content_width is narrower.
-                // This is not necessary for thumbnails and medium size.
-                if ( 'thumbnail' == $size || 'medium' == $size ) {
-                    $width = $size_meta['width'];
-                    $height = $size_meta['height'];
-                } else {
-                    list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
-                }
+                // 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' );
 
                 $sizes[ $size ] = array(