Index: image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.module,v
retrieving revision 1.305
diff -u -p -r1.305 image.module
--- image.module	22 May 2009 19:32:29 -0000	1.305
+++ image.module	18 Jun 2009 15:33:39 -0000
@@ -628,17 +637,13 @@ function image_display(&$node, $label = 
 
   $image_info = image_get_info(file_create_path($node->images[$label]));
   $attributes['class'] = "image image-$label ". (isset($attributes['class']) ? $attributes['class'] : "");
-  // Only output width/height attributes if image_get_info() was able to detect
-  // the image dimensions, since certain browsers interpret an empty attribute
-  // value as zero.
-  if (!empty($image_info['width'])) {
-    $attributes['width'] = $image_info['width'];
-  }
-  if (!empty($image_info['height'])) {
-    $attributes['height'] = $image_info['height'];
-  }
-
-  return theme('image_display', $node, $label, file_create_url($node->images[$label]), $attributes);
+  $image_attributes = array_merge($image_info, $attributes);
+  // Remove empty attributes
+  $image_attributes = array_filter($image_attributes);
+  return theme('image_display', $node, $label, file_create_url($node->images[$label]), $image_attributes);
 }
 
 /**