From e4283aed00c30469bf1e96c9435426a10e8bff37 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Sun, 14 Feb 2010 06:34:47 +0000 Subject: [PATCH] Revert r13103 and merely restrict \$content_width obeying to is_admin(). fixes #12146 git-svn-id: http://svn.automattic.com/wordpress/trunk@13140 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/media.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wp-includes/media.php b/wp-includes/media.php index 9811d0f29..ca27a9558 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -64,6 +64,8 @@ function image_constrain_size_for_editor($width, $height, $size = 'medium') { } 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 && is_admin() ) // Only in admin. Assume that theme authors know what they're doing. + $max_width = min( intval($content_width), $max_width ); } // $size == 'full' has no constraint else {