Index: filefield/filefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield.module,v
retrieving revision 1.188
diff -u -r1.188 filefield.module
--- filefield/filefield.module	8 Apr 2009 20:09:31 -0000	1.188
+++ filefield/filefield.module	12 Apr 2009 02:01:32 -0000
@@ -350,6 +350,27 @@
 }
 
 /**
+ * Implementation of CCK's hook_default_value().
+ *
+ * Note this is a widget-level hook, so it does not affect ImageField or other
+ * modules that extend FileField.
+ *
+ * @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']])) {
+    $form_state['item_count'][$field['field_name']] = 0;
+  }
+
+  // The default value is actually handled in hook_widget().
+  // hook_default_value() is only helpful for new nodes, and we need to affect
+  // all widgets, such as when a new field is added via "Add another item".
+  return array();
+}
+
+/**
  * Implementation of CCK's hook_widget_info().
  */
 function filefield_widget_info() {
Index: imagefield/imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.94
diff -u -r1.94 imagefield.module
--- imagefield/imagefield.module	29 Mar 2009 05:20:07 -0000	1.94
+++ imagefield/imagefield.module	12 Apr 2009 02:01:32 -0000
@@ -238,6 +238,13 @@
 }
 
 /**
+ * Implementation of CCK's hook_default_value().
+ */
+function imagefield_default_value(&$form, &$form_state, $field, $delta) {
+  return filefield_default_value($form, $form_state, $field, $delta);
+}
+
+/**
  * Implementation of hook_form_[form_id]_alter().
  *
  * Modify the add new field form to make "Image" the default formatter.