diff options
| author | Go MAEDA <maeda@farend.jp> | 2023-02-05 05:35:56 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2023-02-05 05:35:56 +0000 |
| commit | 0f32df11d5c7713ac22df8b7cf5efc6b548a6a04 (patch) | |
| tree | 8f2f05a7efd16a8cfbe1948dd6d0cfc16340d828 /app/models/mail_handler.rb | |
| parent | 02b86c9dabb7b9a787391f8e54b1fb246a45c545 (diff) | |
| download | redmine-0f32df11d5c7713ac22df8b7cf5efc6b548a6a04.tar.gz redmine-0f32df11d5c7713ac22df8b7cf5efc6b548a6a04.zip | |
Update Mail gem to 2.8 (#37993).
Patch by Pavel Rosický.
git-svn-id: https://svn.redmine.org/redmine/trunk@22094 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mail_handler.rb')
| -rw-r--r-- | app/models/mail_handler.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 1025bf033..6da848124 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -523,12 +523,7 @@ class MailHandler < ActionMailer::Base part.attachment? end parts.map do |p| - body_charset = - if Mail::RubyVer.respond_to?(:pick_encoding) - Mail::RubyVer.pick_encoding(p.charset).to_s - else - p.charset - end + body_charset = Mail::Utilities.pick_encoding(p.charset).to_s body = Redmine::CodesetUtil.to_utf8(p.body.decoded, body_charset) # convert html parts to text p.mime_type == 'text/html' ? self.class.html_body_to_text(body) : self.class.plain_text_body_to_text(body) |