From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Jan 2012 22:53:40 +0000 (+0000)
Subject: Remove backported code now we are using mail 2.4.1
X-Git-Tag: live~5810
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/478f30d69f142738357bb5aae66a5b00324cd06d

Remove backported code now we are using mail 2.4.1
---

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