Index: filefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield.module,v
retrieving revision 1.206
diff -u -r1.206 filefield.module
--- filefield.module	25 Jul 2009 02:59:36 -0000	1.206
+++ filefield.module	25 Jul 2009 03:24:02 -0000
@@ -374,9 +374,10 @@
  * @see content_default_value()
  */
 function filefield_default_value(&$form, &$form_state, $field, $delta) {
-  // Reduce the default number of upload fields to one.
-  // CCK will automatically add one more field than necessary.
-  if (!isset($form_state['item_count'][$field['field_name']])) {
+  // Reduce the default number of upload fields to one. CCK 2 (but not 3) will
+  // automatically add one more field than necessary. We use the
+  // content_multiple_value_after_build function to determine the version.
+  if (!function_exists('content_multiple_value_after_build') && !isset($form_state['item_count'][$field['field_name']])) {
     $form_state['item_count'][$field['field_name']] = 0;
   }