X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d405637b05783bf14a6bb276f3bc63ec33a1ac23..898cc828dd1f1167f85abbf35c8e3f0ed640ac1e:/config/initializers/mail.rb diff --git a/config/initializers/mail.rb b/config/initializers/mail.rb index d44854414..b93c3f6d2 100644 --- a/config/initializers/mail.rb +++ b/config/initializers/mail.rb @@ -22,38 +22,4 @@ module Mail str end end - - class Message - def decoded_with_text - if self.text? - decode_body_as_text - else - decoded_without_text - end - end - - alias_method_chain :decoded, :text - - def text? - has_content_type? ? !!(main_type =~ /^text$/i) : false - end - - private - - def decode_body_as_text - body_text = body.decoded - if charset - if RUBY_VERSION < '1.9' - require 'iconv' - return Iconv.conv("UTF-8//TRANSLIT//IGNORE", charset, body_text) - else - if encoding = Encoding.find(charset) rescue nil - body_text.force_encoding(encoding) - return body_text.encode(Encoding::UTF_8) - end - end - end - body_text - end - end end