mirror of
https://github.com/redmine/redmine.git
synced 2026-03-25 22:00:43 +01:00
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:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user