From be27caf92db41f1a5dc94e7c2913467e7e493eeb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 30 Apr 2005 08:21:54 +0000 Subject: [PATCH] Fixed that email address like "Jamis Buck, M.D." would cause the quoter to generate emails resulting in "bad address" errors from the mail server #1220 [Jamis Buck] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1247 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/CHANGELOG | 5 +++++ actionmailer/lib/action_mailer/base.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 412edf6b9c..bb87dd9014 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Fixed that email address like "Jamis Buck, M.D." would cause the quoter to generate emails resulting in "bad address" errors from the mail server #1220 [Jamis Buck] + + *0.9.1* (20th April, 2005) * Depend on Action Pack 1.8.1 diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 36159028b7..3b9d25723b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -168,7 +168,7 @@ module ActionMailer #:nodoc: elsif address =~ /^(\S.*)\s+(<.*>)$/ address = $2 phrase = quote_if_necessary($1.gsub(/^['"](.*)['"]$/, '\1'), charset) - "#{phrase} #{address}" + "\"#{phrase}\" #{address}" else address end