Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.30.2.6.2.43
diff -u -r1.30.2.6.2.43 imagefield.module
--- imagefield.module	21 Feb 2008 11:44:54 -0000	1.30.2.6.2.43
+++ imagefield.module	27 Feb 2008 13:41:09 -0000
@@ -638,8 +638,9 @@
     '#suffix' => '</div>',
     '#weight' => 100,
   );
-    
-  if ($field['multiple'] && count($items) < $field['widget']['max_number_images']) {
+
+  $max_images = $field['widget']['max_number_images'];
+  if (!$max_images || !$field['multiple'] || ($field['multiple'] && count($items) < $max_images)) {
     // Seperate from tree becase of that silly things won't be 
     // displayed if they are a child of '#type' = form issue
     $form[$fieldname]['new'][$fieldname .'_upload'] = array(
@@ -663,7 +664,7 @@
   else {
     $form[$fieldname]['#prefix'] = '<div>';
     $form[$fieldname]['new']['#prefix'] = '<div>';
-    $form[$fieldname]['new']['#value'] = t('You can only attach %num images to this field. Delete an image if you wish to be able to upload different images.', array('%num' => $field['max_number_images']));
+    $form[$fieldname]['new']['#value'] = t('You can only attach %num images to this field. Delete an image if you wish to be able to upload different images.', array('%num' => $max_images));
   }