diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-07-06 09:53:34 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-07-06 09:53:34 +0000 |
| commit | bde3df2bec99103eeb91c4caaf0483aacadccd92 (patch) | |
| tree | ca066ea3db87908f122675b3481a3f5c25ee2665 /actionmailer/lib/action_mailer/base.rb | |
| parent | 853ea556749809658c0a5c0c8b61263ec022fba1 (diff) | |
| download | rails-bde3df2bec99103eeb91c4caaf0483aacadccd92.tar.gz rails-bde3df2bec99103eeb91c4caaf0483aacadccd92.tar.bz2 rails-bde3df2bec99103eeb91c4caaf0483aacadccd92.zip | |
Correctly normalize newlines in outgoing emails before encoding the body [John Long]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1732 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 61bc74a81c..89c202fd01 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,6 +1,7 @@ require 'action_mailer/adv_attr_accessor' require 'action_mailer/part' require 'action_mailer/part_container' +require 'action_mailer/utils' require 'tmail/net' module ActionMailer #:nodoc: @@ -293,11 +294,11 @@ module ActionMailer #:nodoc: if @parts.empty? m.set_content_type content_type, nil, { "charset" => charset } - m.body = body + m.body = Utils.normalize_new_lines(body) else if String === body part = TMail::Mail.new - part.body = body + part.body = Utils.normalize_new_lines(body) part.set_content_type content_type, nil, { "charset" => charset } part.set_content_disposition "inline" m.parts << part |