Backported r16285 (#24199).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16295 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2017-01-29 10:39:50 +00:00
parent c717698803
commit 2e6d3f447b
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -177,7 +177,7 @@ class RepositoriesController < ApplicationController
send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
send_type = Redmine::MimeType.of(@path)
send_opt[:type] = send_type.to_s if send_type
send_opt[:disposition] = (Redmine::MimeType.is_type?('image', @path) && !is_raw ? 'inline' : 'attachment')
send_opt[:disposition] = 'attachment'
send_data @content, send_opt
else
# Prevent empty lines when displaying a file with Windows style eol