diff options
author | Dries Buytaert <dries@buytaert.net> | 2005-11-21 15:36:53 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2005-11-21 15:36:53 +0000 |
commit | 4febf6443b74416b26374150808158db95f51083 (patch) | |
tree | 1dc903f118cbc16384f0daec7cbf1bc1a1298c13 /modules/upload.module | |
parent | 61ebf7b56b5a17e87352ca004d08a91855eb2c9e (diff) | |
download | brdo-4febf6443b74416b26374150808158db95f51083.tar.gz brdo-4febf6443b74416b26374150808158db95f51083.tar.bz2 |
- Patch #35121 by m3avrck: fixed problem with list and description values aren't saved for uploaded files.
Diffstat (limited to 'modules/upload.module')
-rw-r--r-- | modules/upload.module | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/modules/upload.module b/modules/upload.module index 333cd7f43..2ce3fe8c6 100644 --- a/modules/upload.module +++ b/modules/upload.module @@ -360,11 +360,11 @@ function upload_save($node) { if ($file = file_save_upload($file, $file->filename)) { $fid = db_next_id('{files}_fid'); db_query("INSERT INTO {files} (fid, nid, vid, filename, filepath, filemime, filesize, list, description) VALUES (%d, %d, %d, '%s', '%s', '%s', %d, %d, '%s')", - $fid, $node->nid, $node->vid, $file->filename, $file->filepath, $file->filemime, $file->filesize, $node->list[$key], $file->description); + $fid, $node->nid, $node->vid, $file->filename, $file->filepath, $file->filemime, $file->filesize, $node->list[$key], $node->description[$key]); } } } - // Remove or update existing files: + // Remove existing files, as needed foreach ((array)$node->remove as $key => $value) { if ($node->remove[$key]) { db_query('DELETE FROM {files} WHERE fid = %d AND vid = %d', $key, $node->vid); @@ -375,20 +375,25 @@ function upload_save($node) { } } } - foreach ((array)$node->list as $key => $value) { - if (!$node->remove[$key]) { - db_query('UPDATE {files} SET list = %d, description = \'%s\' WHERE fid = %d AND vid = %d', $node->list[$key], $node->description[$key], $key, $node->vid); - } - } + // Create a new revision, as needed if ($node->old_vid) { foreach ((array)$node->remove as $key => $remove) { if (!$remove) { $file = db_fetch_object(db_query('SELECT * FROM {files} WHERE vid = %d AND fid = %d', $node->old_vid, $key)); db_query("INSERT INTO {files} (fid, nid, vid, filename, filepath, filemime, filesize, list, description) VALUES (%d, %d, %d, '%s', '%s', '%s', %d, %d, '%s')", - $key, $node->nid, $node->vid, $file->filename, $file->filepath, $file->filemime, $file->filesize, $file->list, $file->description); + $key, $node->nid, $node->vid, $file->filename, $file->filepath, $file->filemime, $file->filesize, $node->list[$key], $node->description[$key]); } } } + // Update existing files, as needed + else { + foreach ((array)$node->list as $key => $value) { + if (!$node->remove[$key]) { + db_query('UPDATE {files} SET list = %d, description = \'%s\' WHERE fid = %d AND vid = %d', $node->list[$key], $node->description[$key], $key, $node->vid); + } + } + } + return; } |