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.42.2.24 -r1.42.2.25
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	18 Mar 2005 13:05:56 -0000	1.42.2.24
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	15 Jul 2005 18:39:40 -0000	1.42.2.25
@@ -679,13 +679,13 @@
     }
 
     set mime_type [cr_filename_to_mime_type -create -- $name]
-    switch  [cr_registered_type_for_mime_type $mime_type] {
-        image {
-	    set content_type "image"
-	}
-	default {
-	    set content_type "file_storage_object"
-	}
+    # we have to do this here because we create the object before
+    # calling cr_import_content
+    
+    if {[db_string image_type_p "" -default 0]} {
+        set content_type image
+    } else {
+        set content_type file_storage_object
     }
 
     db_transaction {
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 -N -r1.15.2.4 -r1.15.2.5
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	7 Sep 2004 20:44:27 -0000	1.15.2.4
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	15 Jul 2005 18:39:40 -0000	1.15.2.5
@@ -154,4 +154,14 @@
     select storage_type from cr_items where item_id=:item_id
   </querytext>
 </fullquery>
-</queryset>
\ No newline at end of file
+
+<fullquery name="fs::add_file.image_type_p">
+    <querytext>
+        select 1
+        from cr_content_mime_type_map
+        where mime_type = :mime_type
+        and content_type = 'image'
+    </querytext>
+</fullquery>
+
+</queryset>