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.12 -r1.48.2.13
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	18 Dec 2005 14:05:30 -0000	1.48.2.12
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	8 Mar 2006 17:11:37 -0000	1.48.2.13
@@ -577,14 +577,21 @@
     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 like_filesystem_p [parameter::get -parameter BehaveLikeFilesystemP -default 1]
+
+    if { $like_filesystem_p } {
+	set file_name $title
+	if {[empty_string_p $file_name]} {
+	    if {![info exists upload_file_name]} {
 		set file_name "unnamedfile"
-    	} else {
-	set file_name $file_upload_name
+	    } else {
+		set file_name $file_upload_name
+	    }
 	}
+    } else {
+	set file_name $file_upload_name
     }
+
     set file_name [remove_special_file_system_characters -string $file_name]
 
     switch $storage_type {