Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.177
diff -u -p -r1.177 upload.module
--- modules/upload/upload.module	16 Aug 2007 12:30:24 -0000	1.177
+++ modules/upload/upload.module	29 Aug 2007 22:30:34 -0000
@@ -296,6 +296,12 @@ function upload_nodeapi(&$node, $op, $te
     case 'insert':
     case 'update':
       if (user_access('upload files')) {
+        // attach session files to node.
+        foreach ($_SESSION['upload_files'] as $fid => $file) {
+          if (empty($node->files[$fid])) {
+            $node->files[$fid] = $file;
+          }
+        }
         upload_save($node);
       }
       break;
@@ -390,7 +396,7 @@ function upload_save(&$node) {
 
     // Remove file. Process removals first since no further processing
     // will be required.
-    if ($file->remove) {
+    if (!empty($file->remove)) {
       db_query('DELETE FROM {upload} WHERE fid = %d AND vid = %d', $fid, $node->vid);
       // Remove it from the session in the case of new uploads,
       // that you want to disassociate before node submission.