Merged r16285 (#24199).

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

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index ec7cb7936098ff47d514c6e7e65373ca6ffb795b..a9bc5793af142700968c8d11dd15bbe8a8fe1af8 100644 (file)
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -197,7 +197,7 @@ class AttachmentsController < ApplicationController
   end
 
   def disposition(attachment)
-    if attachment.is_image? || attachment.is_pdf?
+    if attachment.is_pdf?
       'inline'
     else
       'attachment'

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c963ee00fdcfb0d173854363d477446eb898c0aa..8da996ee2ff242b765a2541b27129488651cae38 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -443,7 +443,7 @@ class RepositoriesController < ApplicationController
   end
 
   def disposition(path)
-    if Redmine::MimeType.is_type?('image', @path) || Redmine::MimeType.of(@path) == "application/pdf"
+    if Redmine::MimeType.of(@path) == "application/pdf"
       'inline'
     else
       'attachment'