--- upload_image.module.orig	Fri Feb 10 22:53:09 2006
+++ upload_image.module	Fri Feb 10 23:12:14 2006
@@ -112,6 +112,7 @@ function upload_image_save($node) {
   if (!$node->uploaded_file && variable_get("upload_image_create_$node->type", 1) && user_access('upload files')) {
     $user = user_load(array('uid' => $node->uid));
     foreach ((array)$node->files as $key => $file) {
+      $file->fid = ($file->fid) ? $file->fid : db_result(db_query("SELECT fid FROM {files} WHERE nid = %d AND filename = '%s'", $node->nid, $file->filename));
       if (!$file->remove && $file->list && ereg('^(image/)', $file->filemime) && $file->fid && !db_result(db_query('SELECT * FROM {upload_images} WHERE fid = %d', $file->fid))) {
         // Create new image
         $image = new StdClass();
@@ -127,7 +128,7 @@ function upload_image_save($node) {
         _image_build_derivatives($image, true);
         // $image = node_validate($image);
         $image->nid = node_save($image);
-        db_query("INSERT INTO {upload_images} (nid, fid, oid) VALUES (%d, %d, %d)", $image->nid, $key, $node->nid);
+        db_query("INSERT INTO {upload_images} (nid, fid, oid) VALUES (%d, %d, %d)", $image->nid, $file->fid, $node->nid);
         drupal_set_message(t('Created image post from your uploaded file %file. You can look and update at it <a href="%url">here</a>.', array('%file' => theme('placeholder', $file->filename), '%url' => "node/$image->nid")));
       }
       else if ($file->remove && ereg('^(image/)', $file->filemime) && variable_get("upload_image_delete_$node->type", 1)) {