Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php	(revision 13105)
+++ wp-includes/media.php	(working copy)
@@ -434,6 +434,7 @@
 				'file' => basename( $resized_file ),
 				'width' => $info[0],
 				'height' => $info[1],
+				'crop' => $crop
 			);
 		}
 	}
@@ -460,13 +461,17 @@
  * @param array|string $size Optional, default is 'thumbnail'. Size of image, either array or string.
  * @return bool|array False on failure or array of file path, width, and height on success.
  */
-function image_get_intermediate_size($post_id, $size='thumbnail') {
+function image_get_intermediate_size($post_id, $size = 'thumbnail' ) {
 	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
 		return false;
 
+	$croped_ok = ( in_array($size, array('thumbnail', 'post-thumbnail')) && get_option('thumbnail_crop') );
+
 	// get the best one for a specified set of dimensions
 	if ( is_array($size) && !empty($imagedata['sizes']) ) {
 		foreach ( $imagedata['sizes'] as $_size => $data ) {
+			if ( !$croped_ok && !empty($data['crop']) )
+				continue;
 			// already cropped to width or height; so use this size
 			if ( ( $data['width'] == $size[0] && $data['height'] <= $size[1] ) || ( $data['height'] == $size[1] && $data['width'] <= $size[0] ) ) {
 				$file = $data['file'];