? .cvsignore
? .str_vs_preg.php.swp
? imagecache_cleanup_build_derivative.patch
? str_vs_preg.php.txt
Index: imagecache.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagecache/imagecache.module,v
retrieving revision 1.108
diff -u -p -r1.108 imagecache.module
--- imagecache.module	3 May 2009 14:06:57 -0000	1.108
+++ imagecache.module	3 May 2009 14:25:24 -0000
@@ -605,18 +605,12 @@ function imagecache_user($op, &$edit, &$
 }
 
 /**
- * Implementation of hook_imagefield_file().
+ * Implementation of filefield.module's hook_file_delete().
+ *
+ * Remove derivative images after the originals are deleted by filefield.
  */
-function imagecache_imagefield_file($op, $file) {
-  switch ($op) {
-    // Delete imagecache presets when imagecache images are deleted.
-    case 'delete': imagecache_image_flush($file['filepath']); break;
-
-    // Create imagecache derivatives when files are saved.
-    case 'save':
-      break;
-  }
-
+function imagecache_file_delete($file) {
+  imagecache_image_flush($file->filepath);
 }
 
 /**