Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.30.2.8
diff -u -r1.30.2.8 imagefield.module
--- imagefield.module	7 Mar 2007 06:56:48 -0000	1.30.2.8
+++ imagefield.module	19 Apr 2007 01:25:38 -0000
@@ -153,6 +153,7 @@
       foreach ($node_field as  $delta => $item) {
         $node_field[$delta] = imagefield_file_insert($node, $item, $field); 
       }
+      imagefield_clear_field_session($fieldname);
       break;
 
     // called before content.module defaults.
@@ -166,6 +167,7 @@
       }
       // Compact deltas.
       $node_field = array_values($node_field);
+      imagefield_clear_field_session($fieldname);
       break;
 
     case 'delete':
@@ -327,7 +329,7 @@
 
     case 'prepare form values':
       // clean up the session if we weren't posted.
-      if (!count($_POST)) {
+      if (empty($_POST) && preg_match('#node/(\d+/edit)|(add/'. $content_type .')#', $_GET['q'])) {
         imagefield_clear_session();
       }