Index: imagefield.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.install,v
retrieving revision 1.2.4.3
diff -u -r1.2.4.3 imagefield.install
--- imagefield.install	10 Feb 2009 20:07:10 -0000	1.2.4.3
+++ imagefield.install	14 Mar 2009 23:48:48 -0000
@@ -72,6 +72,17 @@
  * Change default formatter key from 'default' to 'imagefield_default'.
  */
 function imagefield_update_3() {
+  // Update removed, "default" is now the default formatter again.
+  return array();
+}
+
+/**
+ * Change default formatter back from 'imagefield_default' to 'default'.
+ *
+ * CCK always makes the default formatter "default". It's best not to fight it
+ * and make our default the same.
+ */
+function imagefield_update_4() {
   $ret = array();
   include_once(drupal_get_path('module', 'content') .'/content.module');
   include_once(drupal_get_path('module', 'content') .'/content_admin.inc');
@@ -80,8 +91,8 @@
     $needs_update = FALSE;
     $display_settings = unserialize($row['display_settings']);
     foreach (_content_admin_display_contexts() as $context) {
-      if ($display_settings[$context]['format'] == 'default') {
-        $display_settings[$context]['format'] = 'imagefield_default';
+      if ($display_settings[$context]['format'] == 'imagefield_default' || empty($display_settings[$context]['format'])) {
+        $display_settings[$context]['format'] = 'default';
         $needs_update = TRUE;
       }
     }
@@ -92,5 +103,3 @@
   content_clear_type_cache();
   return $ret;
 }
-
-
Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.30.2.6.2.70
diff -u -r1.30.2.6.2.70 imagefield.module
--- imagefield.module	9 Feb 2009 21:01:38 -0000	1.30.2.6.2.70
+++ imagefield.module	14 Mar 2009 23:48:49 -0000
@@ -384,7 +384,7 @@
 
     case 'view':
       $context = $teaser ? 'teaser' : 'full';
-      $formatter = isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'imagefield_default';
+      $formatter = isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'default';
       if ($field['use_default_image'] && empty($items) ) {
         $items[0] = $field['default_image'];
       }
@@ -908,11 +908,10 @@
 
 /**
  * Implementation of hook_field_formatter_info().
-
  */
 function imagefield_field_formatter_info() {
   $formatters = array(
-    'imagefield_default' => array(
+    'default' => array(
       'label' => 'Default',
       'field types' => array('image'),
     ),