mirror of
https://github.com/redmine/redmine.git
synced 2025-10-26 07:46:17 +01:00
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
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -9,7 +9,7 @@ gem 'mini_mime', '~> 1.1.0'
|
||||
gem "actionpack-xml_parser"
|
||||
gem 'roadie-rails', '~> 3.0.0'
|
||||
gem 'marcel'
|
||||
gem "mail", "~> 2.7.1"
|
||||
gem 'mail', '~> 2.8.1'
|
||||
gem 'nokogiri', '~> 1.14.0'
|
||||
gem 'i18n', '~> 1.12.0'
|
||||
gem "rbpdf", "~> 1.20.0"
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user