From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jan 2017 10:39:50 +0000 (+0000)
Subject: Backported r16285 (#24199).
X-Git-Tag: 3.2.6~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2e6d3f447bb6d0550fe12782b0d5e9f148fda55f;p=redmine.git

Backported r16285 (#24199).

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16295 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

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
 
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ded172a36..9e03ab8ee 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -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