Skip to content
Snippets Groups Projects
Commit cc267f72 authored by Robert Douglass's avatar Robert Douglass
Browse files

Updating upload.module patch so that it applies agains current CVS. Closes...

Updating upload.module patch so that it applies agains current CVS. Closes http://drupal.org/node/19841
parent e50d887a
Branches
Tags
No related merge requests found
Index: upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload.module,v
retrieving revision 1.28
diff -u -r1.28 upload.module
--- upload.module 8 Feb 2005 19:43:02 -0000 1.28
+++ upload.module 19 Feb 2005 09:02:45 -0000
@@ -263,7 +263,7 @@
retrieving revision 1.34
diff -u -r1.34 upload.module
--- upload.module 7 May 2005 02:00:34 -0000 1.34
+++ upload.module 13 May 2005 08:04:25 -0000
@@ -297,7 +297,7 @@
foreach ($node->files as $file) {
if ($file->list) {
$files[] = $file;
......@@ -14,7 +14,7 @@ diff -u -r1.28 upload.module
}
if (count($files) > 0) {
// RSS only allows one enclosure per item
@@ -300,8 +300,10 @@
@@ -334,8 +334,10 @@
// Insert new files:
if ($file = file_save_upload($file, $file->filename)) {
$fid = db_next_id('{files}_fid');
......@@ -25,7 +25,7 @@ diff -u -r1.28 upload.module
}
}
else {
@@ -309,9 +311,11 @@
@@ -343,9 +345,11 @@
if ($node->remove[$key]) {
file_delete($file->filepath);
db_query("DELETE FROM {files} WHERE fid = %d", $key);
......@@ -37,7 +37,7 @@ diff -u -r1.28 upload.module
}
}
}
@@ -324,6 +328,7 @@
@@ -358,6 +362,7 @@
file_delete($file->filepath);
}
db_query("DELETE FROM {files} WHERE nid = %d", $node->nid);
......@@ -45,7 +45,7 @@ diff -u -r1.28 upload.module
}
function upload_form($node) {
@@ -359,6 +364,7 @@
@@ -393,6 +398,7 @@
$result = db_query("SELECT * FROM {files} WHERE nid = %d", $node->nid);
while ($file = db_fetch_object($result)) {
$files[$file->fid] = $file;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment