Merged r3258 and r3281 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-09 10:02:16 +00:00
parent 9d2474c234
commit 4c75864948
6 changed files with 46 additions and 4 deletions
@@ -58,6 +58,9 @@ class Attachment < ActiveRecord::Base
        self.filename = sanitize_filename(@temp_file.original_filename)
        self.disk_filename = Attachment.disk_filename(filename)
        self.content_type = @temp_file.content_type.to_s.chomp
+        if content_type.blank?
+          self.content_type = Redmine::MimeType.of(filename)
+        end
        self.filesize = @temp_file.size
      end
    end