Index: imagefield.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.install,v
retrieving revision 1.14
diff -u -p -r1.14 imagefield.install
--- imagefield.install	8 Sep 2008 19:26:46 -0000	1.14
+++ imagefield.install	8 Oct 2008 20:15:44 -0000
@@ -85,8 +85,6 @@ function imagefield_update_2() {
   return $ret;
 }
 
-
-
 /**
  * Upgrade to CCK 2 and Drupal 6.
  * @todo: update widget type from 'image' to 'imagefield_widget_default'
@@ -98,10 +96,14 @@ function imagefield_update_2() {
  *    imagefield_url => url_plain
  */
 function imagefield_update_6001() {
+  // Make sure CCK's been updated first.
+  if ($abort = content_check_update('imagefield')) {
+    return $abort;
+  }
+
   module_load_include('inc', 'content', 'includes/content.admin');
   module_load_include('inc', 'content', 'includes/content.crud');
 
-
   foreach (content_fields() as $field) {
     // skip non imagefields.
     if ($field['type'] != 'image') continue;