diff options
Diffstat (limited to 'lib/redmine/thumbnail.rb')
| -rw-r--r-- | lib/redmine/thumbnail.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb index f9db6c93f..2e506dc78 100644 --- a/lib/redmine/thumbnail.rb +++ b/lib/redmine/thumbnail.rb @@ -18,7 +18,6 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. require 'fileutils' -require 'mimemagic' module Redmine module Thumbnail @@ -34,8 +33,7 @@ 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? + mime_type = File.open(source) {|f| Marcel::MimeType.for(f)} return nil if !ALLOWED_TYPES.include? mime_type return nil if is_pdf && mime_type != "application/pdf" |