diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-10-03 09:30:43 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-10-03 09:30:43 +0000 |
| commit | 77639026296c0ce9ada9be5bb2ddf263b32e7904 (patch) | |
| tree | 23a7616153e9272f59c080beaa7917f53b8d573a | |
| parent | cffc5d6a12add6b058fbfb79b807637f138a3061 (diff) | |
| download | redmine-77639026296c0ce9ada9be5bb2ddf263b32e7904.tar.gz redmine-77639026296c0ce9ada9be5bb2ddf263b32e7904.zip | |
Use Redmine::MimeType.of instead of regexp to check if the attachment is Textile (#29752).
git-svn-id: http://svn.redmine.org/redmine/trunk@18586 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/attachment.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/mime_type.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 0cd666499..0b151dabb 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -245,7 +245,7 @@ class Attachment < ActiveRecord::Base end def is_textile? - self.filename =~ /\.textile$/i + Redmine::MimeType.of(filename) == 'text/x-textile' end def is_image? diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb index e4801da21..23bd3df1d 100644 --- a/lib/redmine/mime_type.rb +++ b/lib/redmine/mime_type.rb @@ -35,6 +35,7 @@ module Redmine 'text/x-ruby' => 'rb,rbw,ruby,rake,erb', 'text/x-csh' => 'csh', 'text/x-sh' => 'sh', + 'text/x-textile' => 'textile', 'text/xml' => 'xml,xsd,mxml', 'text/yaml' => 'yml,yaml', 'text/csv' => 'csv', |