From 46e11396b80ba38592d39d06b8a7090c74af2e1d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 29 Jan 2017 10:39:34 +0000 Subject: [PATCH] Merged r16285 (#24199). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16294 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/attachments_controller.rb | 2 +- app/controllers/repositories_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index ec7cb7936..a9bc5793a 100644 --- 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 c963ee00f..8da996ee2 100644 --- 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' -- 2.39.5