Commit 63e1b267 authored by maeda's avatar maeda

Refactor Redmine::MimeType.of. Uses MiniMime.lookup_by_extension instead of...

Refactor Redmine::MimeType.of. Uses MiniMime.lookup_by_extension instead of lookup_by_filename (#29359).


git-svn-id: https://svn.redmine.org/redmine/trunk@17473 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 3390f8f7
......@@ -7,7 +7,7 @@ end
gem "rails", "5.2.1"
gem "coderay", "~> 1.1.1"
gem "request_store", "1.0.5"
gem "mini_mime", "~> 1.0"
gem "mini_mime", "~> 1.0.1"
gem "actionpack-xml_parser"
gem "roadie-rails", "~> 1.3.0"
gem "roadie", "~> 3.2.1"
......
......@@ -59,15 +59,11 @@ module Redmine
# returns mime type for name or nil if unknown
def self.of(name)
return nil unless name.present?
extension = File.extname(name)[1..-1].to_s.downcase
if extension.present?
@known_types ||= Hash.new do |h, ext|
type = EXTENSIONS[ext]
type ||= MiniMime.lookup_by_filename("a.#{ext}").try(:content_type)
h[ext] = type
end
@known_types[extension]
ext = File.extname(name.to_s)[1..-1]
if ext
ext.downcase!
EXTENSIONS[ext] ||
((mi = MiniMime.lookup_by_extension(ext)) && mi.content_type)
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment