Changeset 23096

Timestamp:

12/06/2012 06:25:39 AM (12 years ago)

Author:

markjaquith

Message:

Present the correct downsized image dimensions in the Media modal when inserting. Introduces a context parameter for image_constrain_size_for_editor() instead of relying on is_admin(). props jond3r, nacin. fixes #22738

File:

• trunk/wp-includes/media.php (modified) (4 diffs)

trunk/wp-includes/media.php

@@ -30 +30 @@
  * @param int $height Height of the image
  * @param string|array $size Size of what the result image should be.
+ * @param context Could be 'display' (like in a theme) or 'edit' (like inserting into a neditor)
  * @return array Width and height of what the result image should resize to.
  */
-function image_constrain_size_for_editor($width, $height, $size = 'medium') {
+function image_constrain_size_for_editor($width, $height, $size = 'medium', $context = null ) {
     global $content_width, $_wp_additional_image_sizes;
+
+    if ( ! $context )
+        $context = is_admin() ? 'edit' : 'display';
 
     if ( is_array($size) ) {
@@ -65 +69 @@
         $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
         $max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-        if ( intval($content_width) > 0 && is_admin() ) // Only in admin. Assume that theme authors know what they're doing.
+        if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
             $max_width = min( intval($content_width), $max_width );
     }
@@ -74 +78 @@
     }
 
-    list( $max_width, $max_height ) = apply_filters( 'editor_max_image_size', array( $max_width, $max_height ), $size );
+    list( $max_width, $max_height ) = apply_filters( 'editor_max_image_size', array( $max_width, $max_height ), $size, $context );
 
     return wp_constrain_dimensions( $width, $height, $max_width, $max_height );
@@ -1379 +1383 @@
                 // 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.
+                // 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' );
+                }
+
                 $sizes[ $size ] = array(
-                    'height'      => $size_meta['height'],
-                    'width'       => $size_meta['width'],
+                    'height'      => $height,
+                    'width'       => $width,
                     'url'         => $base_url . $size_meta['file'],
-                    'orientation' => $size_meta['height'] > $size_meta['width'] ? 'portrait' : 'landscape',
+                    'orientation' => $height > $width ? 'portrait' : 'landscape',
                 );
             }