diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/foi_attachment.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/models/foi_attachment.rb b/app/models/foi_attachment.rb index 0af47b26e..eb6e27dd4 100644 --- a/app/models/foi_attachment.rb +++ b/app/models/foi_attachment.rb @@ -70,8 +70,8 @@ class FoiAttachment < ActiveRecord::Base delay = 1 begin binary_data = File.open(self.filepath, "rb" ){ |file| file.read } - if self.content_type =~ /^text/ - @cached_body = convert_string_to_utf8_or_binary(binary_data, 'UTF-8') + if text_type? + @cached_body = convert_string_to_utf8(binary_data, 'UTF-8') else @cached_body = binary_data end @@ -93,6 +93,7 @@ class FoiAttachment < ActiveRecord::Base return @cached_body end + # List of DSN codes taken from RFC 3463 # http://tools.ietf.org/html/rfc3463 DsnToMessage = { @@ -294,5 +295,11 @@ class FoiAttachment < ActiveRecord::Base AttachmentToHTML.to_html(self, to_html_opts) end + private + + def text_type? + AlaveteliTextMasker::TextMask.include?(content_type) + end + end |