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.10 -r1.42.2.11
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	2 Aug 2004 16:55:21 -0000	1.42.2.10
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	2 Aug 2004 19:56:00 -0000	1.42.2.11
@@ -662,8 +662,10 @@
 
     if {[parameter::get -parameter "StoreFilesInDatabaseP" -package_id $package_id]} {
 	set indbp "t"
+        set storage_type "lob"
     } else {
 	set indbp "f"
+        set storage_type "file"
     }
 
     set mime_type [cr_filename_to_mime_type -create $name]
@@ -696,7 +698,8 @@
 			     -creation_ip $creation_ip \
 			     -title $title \
 			     -description $description \
-			     -suppress_notify_p $do_notify_here_p
+			     -suppress_notify_p $do_notify_here_p \
+                             -storage_type $storage_type
 			]
 	
 	if {[string is true $do_notify_here_p]} {
@@ -716,18 +719,15 @@
     {-title ""}
     {-description ""}
     {-suppress_notify_p "f"}
-    
+    {-storage_type ""}
 } {
     Create a new version of a file storage item 
     @return revision_id
 } {
-
-    if {[parameter::get -parameter "StoreFilesInDatabaseP" -package_id $package_id]} {
-	set storage_type "lob"
-    } else {
-	set storage_type "file"
+    # always use the storage type of the existing item
+    if {[string equal "" $storage_type]} {
+        set storage_type [db_string get_storage_type ""]
     }
-
     set mime_type [cr_filename_to_mime_type -create $name]
     set tmp_size [file size $tmp_filename]
     set parent_id [get_parent -item_id $item_id]
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.xql,v
diff -u -r1.15.2.2 -r1.15.2.3
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	27 Jul 2004 17:27:39 -0000	1.15.2.2
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	2 Aug 2004 19:56:00 -0000	1.15.2.3
@@ -155,4 +155,11 @@
       where folder_id = :folder_id
     </querytext>
   </fullquery>
-</queryset>
+
+
+<fullquery name="fs::add_version.get_storage_type">
+  <querytext>
+    select storage_type from cr_items where item_id=:item_id
+  </querytext>
+</fullquery>
+</queryset>
\ No newline at end of file