Ticket #34225: 34225.diff

wp-includes/media.php

@@ -70 +70 @@
                  */
                 $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 && 'edit' == $context ) {
                         $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 ) ) ) {
                 $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.
+                if ( intval($content_width) > 0 && 'edit' == $context ) {
                         $max_width = min( intval($content_width), $max_width );
+                }
         }
         // $size == 'full' has no constraint
         else {
@@ -2931 +2934 @@
 
                                 // 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' );
+                                list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'info' );
 
                                 $sizes[ $size ] = array(
                                         'height'      => $height,