use String#encode instead of Iconv.conv

ruby · Aug 20, 2016 · c3e7d63 · c3e7d63
1 parent 38c8f71
commit c3e7d63
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/lib/redmine_ruby_lang_mailing_list_customization/redmine_ext/mail_handler.rb b/lib/redmine_ruby_lang_mailing_list_customization/redmine_ext/mail_handler.rb
@@ -1,9 +1,8 @@
-require 'iconv'
 MailHandler.class_eval do
   def dispatch_with_ruby_lang_mailing_list_customization
     if charset = email.header.charset and charset.downcase != 'utf-8'
-      email.body = Iconv.conv("UTF-8", charset, email.body) rescue nil
-      email.subject = Iconv.conv("UTF-8", charset, email.subject) rescue nil
+      email.body = email.body.encode("UTF-8", charset) rescue nil
+      email.subject = email.subject.encode("UTF-8", charset) rescue nil
     end
     email.subject = email.subject.sub(/\[#{Regexp.escape driver.mailing_list.identifier}:\d+\]/, '')
     if subject_tag_re =~ email.subject