Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.94
diff -u -r1.94 imagefield.module
--- imagefield.module	29 Mar 2009 05:20:07 -0000	1.94
+++ imagefield.module	11 Apr 2009 18:46:33 -0000
@@ -12,7 +12,13 @@
  * Load required includes and css files.
  */
 function imagefield_init() {
-  // field_file hooks and callbacks.
+  // If FileField is not available, immediately disable ImageField.
+  if (!module_exists('filefield')) {
+    module_disable(array('imagefield'));
+    drupal_set_message(t('The ImageField module has been disabled. The <a href="http://drupal.org/project/filefield">FileField module</a> needs to be installed for it to work properly.'));
+    return;
+  }
+
   module_load_include('inc', 'imagefield', 'imagefield_file');
   module_load_include('inc', 'imagefield', 'imagefield_widget');
 }