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.48.2.7 -r1.48.2.8
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	22 Sep 2005 12:37:34 -0000	1.48.2.7
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	26 Sep 2005 09:00:19 -0000	1.48.2.8
@@ -481,7 +481,7 @@
     }
 
     db_1row select_object_info {}
-
+    
     if {[string equal folder $type]} {
 	set result [publish_folder_to_file_system -folder_id $object_id -path $path -folder_name $name -user_id $user_id]
     } elseif {[string equal url $type]} {
@@ -509,8 +509,9 @@
 	set folder_name [get_object_name -object_id $folder_id]
     }
     set folder_name [remove_special_file_system_characters -string $folder_name]
-
-    set dir [file join ${path} ${folder_name}]
+    
+    set dir "[file join ${path} "${folder_name}"]"
+    # set dir "[file join ${path} "download"]"
     file mkdir $dir
 
     foreach object [get_folder_contents -folder_id $folder_id -user_id $user_id] {
@@ -567,6 +568,8 @@
 
     db_1row select_object_metadata {}
 
+    # After upgrade change title and filename...
+    set file_name $title
     if {[empty_string_p $file_name]} {
         if {![info exists upload_file_name]} {
 		set file_name "unnamedfile"