From 3e7aa0391fb0da5ea6c38ceb682c8634d3a1cb72 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Sat, 9 Sep 2006 20:16:42 +0000
Subject: Make sure DOS newlines in quoted-printable text are normalized to
unix newlines before unquoting. closes $166 and #4452
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5079 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 1 +
1 file changed, 1 insertion(+)
(limited to 'actionmailer/lib')
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
index c73157fe61..8fbb6e55de 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
@@ -68,6 +68,7 @@ module TMail
def unquote_quoted_printable_and_convert_to(text, to, from, preserve_underscores=false)
text = text.gsub(/_/, " ") unless preserve_underscores
+ text = text.gsub(/\r\n|\r/, "\n") # normalize newlines
convert_to(text.unpack("M*").first, to, from)
end
--
cgit v1.2.3