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 -N -r1.67.2.9 -r1.67.2.10
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	9 Sep 2014 08:32:03 -0000	1.67.2.9
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	10 Sep 2014 14:04:22 -0000	1.67.2.10
@@ -621,12 +621,18 @@
 	    } else {
 		set file_name $file_upload_name
 	    }
-	} elseif { [item::get_mime_info [content::item::get_live_revision -item_id $object_id]] } {
+	} elseif {[content::item::get -item_id $object_id -array_name item_info]} {
 	    # We make sure that the file_name contains the file
 	    # extension at the end so that the users default
 	    # application for that file type can be used
-	    if { ![regexp "\.$mime_info(file_extension)$" $file_name match] } {
-		set file_name "${file_name}.$mime_info(file_extension)"
+	    
+	    set mime_type $item_info(mime_type)
+	    set file_extension [db_string get_extension {
+		select file_extension from cr_mime_types where mime_type = :mime_type
+	    }]
+
+	    if { ![regexp "\.$file_extension$" $file_name match] } {
+		set file_name "$file_name.$file_extension"
 	    }
 	}
     } else {
@@ -1320,7 +1326,11 @@
     # hardcoding it for now
     set editable_mime_types [list "text/html" "text/plain"]
 
-    item::get_mime_info [content::item::get_live_revision -item_id $item_id]
+    content::item::get -item_id $item_id -array_name item_info
+    set mime_info(mime_type) [set mime_type $item_info(mime_type)]
+    set mime_info(file_extension) [db_string get_extension {
+	select file_extension from cr_mime_types where mime_type = :mime_type
+    }]
 
     if {[string tolower $mime_info(mime_type)] in $editable_mime_types} {
         set mime_info(editable_p) 1