Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -r1.42.2.15 -r1.42.2.16
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	3 Sep 2004 11:46:32 -0000	1.42.2.15
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	8 Sep 2004 17:16:28 -0000	1.42.2.16
@@ -487,7 +487,7 @@
     } elseif {[string equal url $type]} {
 	set result [publish_url_to_file_system -object_id $object_id -path $path -file_name $file_name]
     } else {
-	set result [publish_versioned_object_to_file_system -object_id $object_id -path $path]
+	set result [publish_versioned_object_to_file_system -object_id $object_id -path $path -file_name $file_name]
     }
 
     return $result
@@ -568,7 +568,11 @@
     db_1row select_object_metadata {}
 
     if {[empty_string_p $file_name]} {
+        if {![info exists upload_file_name]} {
+		set file_name "unnamedfile"
+    	} else {
 	set file_name $file_upload_name
+	}
     }
     set file_name [remove_special_file_system_characters -string $file_name]