Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 20 insertions, 0 deletions

diff --git a/lib/vendor/tmail.rb b/lib/vendor/tmail.rb
new file mode 100644
index 000000000..eb077f208
--- /dev/null
+++ b/lib/vendor/tmail.rb
@@ -0,0 +1,20 @@
+$:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.7"
+
+require 'tmail'
+
+module TMail
+  # TMail::Unquoter.convert_to_with_fallback_on_iso_8859_1 introduced in TMail 1.2.7
+  # triggers a test failure in test_add_issue_with_japanese_keywords(MailHandlerTest)
+  class Unquoter
+    class << self
+      alias_method :convert_to, :convert_to_without_fallback_on_iso_8859_1
+    end
+  end
+
+  # Patch for TMail 1.2.7. See http://www.redmine.org/issues/8751
+  class Encoder
+    def puts_meta(str)
+      add_text str
+    end
+  end
+end