Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.71
diff -u -r1.71 imagefield.module
--- imagefield.module	27 Aug 2008 15:03:06 -0000	1.71
+++ imagefield.module	12 Dec 2008 10:08:27 -0000
@@ -135,11 +135,22 @@
 }
 
 /**
+ * Implementation of hook_form_alter(). Set the appropriate
+ * attibutes to allow file uploads on the field settings form.
+ */
+function imagefield_form_alter(&$form, $form_state, $form_id) {
+  if ($form_id == 'content_field_edit_form') {
+    $form['#attributes'] = array('enctype' => 'multipart/form-data');
+  }
+}
+
+
+/**
  * Implementation of CCK's hook_field().
  *
  * @see: function imagefield_field_settings().
  */
-function imagefield_field($op, $node, $field, &$items, $teaser, $page) {
+function imagefield_field($op, $node, $field, &$items, $teaser, $page){
   return filefield_field($op, $node, $field, $items, $teaser, $page);
 }
 
@@ -162,7 +173,7 @@
       'label' => t('Image'),
       'field types' => array('image', 'filefield'),
       'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array('default value' => CONTENT_CALLBACK_CUSTOM),
+      'callbacks' => array('default value' => CONTENT_CALLBACK_DEFAULT),
       // callback for dynamic filefield widgets to determine
       // if this widget is appropriate for a file type.
       'suitability callback' => 'imagefield_handles_file',
@@ -190,7 +201,7 @@
   // @todo: use CCK's default value callback.
   // add default values to items.
   if (empty($items[$delta])) {
-    $items[$delta] = array('alt' => '', 'title' => '');
+    $items[$delta] = _filefield_default_value($field);
   }
   $element = filefield_widget($form, $form_state, $field, $items, $delta);
 
Index: imagefield_formatter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield_formatter.inc,v
retrieving revision 1.6
diff -u -r1.6 imagefield_formatter.inc
--- imagefield_formatter.inc	27 Aug 2008 14:53:56 -0000	1.6
+++ imagefield_formatter.inc	8 Dec 2008 08:47:18 -0000
@@ -7,16 +7,17 @@
 
 
 function theme_imagefield_formatter_image_plain($element) {
+	
   // Inside a View this function may be called with null data.  In that case,
   // just return.
   if (empty($element['#item'])) {
     return '';
   }
-
+  
   $field = content_fields($element['#field_name']);
   $item = $element['#item'];
 
-  if (empty($item['fid']) && $field['use_default_image']) $item = $field['default_image'];
+  if (empty($item['fid']) && $field['default_value']) $item = $field['default_value'];
   if (empty($item['filepath']))  $item = array_merge($item, field_file_load($item['fid']));
 
   $class = 'imagefield imagefield-'. $field['field_name'];
@@ -29,7 +30,9 @@
   if (empty($element['#item'])) {
     return '';
   }
-
+  if (empty($item['fid']) && $field['default_value']) $item = $field['default_value'];
+  if (empty($item['filepath']))  $item = array_merge($item, field_file_load($item['fid']));
+  
   $node = $element['#node'];
   $imagetag = theme('imagefield_formatter_image_plain', $element);
   $class = 'imagefield imagefield-nodelink imagefield-'. $element['#field_name'];
@@ -42,7 +45,9 @@
   if (empty($element['#item'])) {
     return '';
   }
-
+  if (empty($item['fid']) && $field['default_value']) $item = $field['default_value'];
+  if (empty($item['filepath']))  $item = array_merge($item, field_file_load($item['fid']));
+  
   $item = $element['#item'];
   $imagetag = theme('imagefield_formatter_image_plain', $element);
   $original_image_url = file_create_url($item['filepath']);