summaryrefslogtreecommitdiffstats
path: root/lib/plugins/acts_as_attachable
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-05-02 07:38:04 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-05-02 07:38:04 +0000
commit61776a8b7e60e2a794080b8d2b72c707086adfd8 (patch)
tree0ebacc25135a05a35ea06ffb6f0e110bc538fcbe /lib/plugins/acts_as_attachable
parent382ca5055a3a28726b5b66cb79856fbeaaaf73e9 (diff)
downloadredmine-61776a8b7e60e2a794080b8d2b72c707086adfd8.tar.gz
redmine-61776a8b7e60e2a794080b8d2b72c707086adfd8.zip
Blank content type for attachments attached via Ajax file upload (Patch by Jens Krämer).
git-svn-id: http://svn.redmine.org/redmine/trunk@13125 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/plugins/acts_as_attachable')
-rw-r--r--lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index ae7e605e1..a816490cc 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -87,7 +87,7 @@ module Redmine
a = Attachment.find_by_token(token)
next unless a
a.filename = attachment['filename'] unless attachment['filename'].blank?
- a.content_type = attachment['content_type']
+ a.content_type = attachment['content_type'] unless attachment['content_type'].blank?
end
next unless a
a.description = attachment['description'].to_s.strip