diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /app/models/mail_handler.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mail_handler.rb')
| -rw-r--r-- | app/models/mail_handler.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 4aaa21c98..be737931c 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -42,7 +42,7 @@ class MailHandler < ActionMailer::Base @@handler_options[:no_notification] = (@@handler_options[:no_notification].to_s == '1') @@handler_options[:no_permission_check] = (@@handler_options[:no_permission_check].to_s == '1') - email.force_encoding('ASCII-8BIT') if email.respond_to?(:force_encoding) + email.force_encoding('ASCII-8BIT') super(email) end @@ -417,7 +417,7 @@ class MailHandler < ActionMailer::Base end parts.reject! do |part| - part.header[:content_disposition].try(:disposition_type) == 'attachment' + part.attachment? end @plain_text_body = parts.map do |p| |