summaryrefslogtreecommitdiffstats
path: root/app/controllers/attachments_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-01-29 10:39:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-01-29 10:39:50 +0000
commit2e6d3f447bb6d0550fe12782b0d5e9f148fda55f (patch)
treef3f558618232bf232880bc6f9d7434e47b0ca7a4 /app/controllers/attachments_controller.rb
parentc717698803d7d91708a07f788cb1c24f4828f3dd (diff)
downloadredmine-2e6d3f447bb6d0550fe12782b0d5e9f148fda55f.tar.gz
redmine-2e6d3f447bb6d0550fe12782b0d5e9f148fda55f.zip
Backported r16285 (#24199).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16295 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/attachments_controller.rb')
-rw-r--r--app/controllers/attachments_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 6113957d4..c2b5fa9c8 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -57,7 +57,7 @@ class AttachmentsController < ApplicationController
# images are sent inline
send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
:type => detect_content_type(@attachment),
- :disposition => (@attachment.image? ? 'inline' : 'attachment')
+ :disposition => 'attachment'
end
end