From: Go MAEDA <maeda@farend.jp>
Date: Sat, 27 Mar 2021 10:16:34 +0000 (+0000)
Subject: Remove duplicate code in Redmine::Thumbnail.generate (#34969).
X-Git-Tag: 4.2.0~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3a962fe36549588284eb1c3b126789a193702cad;p=redmine.git

Remove duplicate code in Redmine::Thumbnail.generate (#34969).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@20861 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb
index 32fd035be..53a0f5350 100644
--- a/lib/redmine/thumbnail.rb
+++ b/lib/redmine/thumbnail.rb
@@ -34,16 +34,12 @@ module Redmine
       return nil if is_pdf && !gs_available?
 
       unless File.exists?(target)
+        # Make sure we only invoke Imagemagick if the file type is allowed
         mime_type = File.open(source) {|f| MimeMagic.by_magic(f).try(:type)}
         return nil if mime_type.nil?
         return nil if !ALLOWED_TYPES.include? mime_type
         return nil if is_pdf && mime_type != "application/pdf"
 
-        # Make sure we only invoke Imagemagick if the file type is allowed
-        unless File.open(source) {|f| ALLOWED_TYPES.include? MimeMagic.by_magic(f).try(:type)}
-          return nil
-        end
-
         directory = File.dirname(target)
         unless File.exists?(directory)
           FileUtils.mkdir_p directory