diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-23 20:50:49 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-23 20:50:49 +1100 |
| commit | a6eed86c33fbd074a08b76a678e968f521cf37b0 (patch) | |
| tree | 65118348b718384a155b404f343c70cbd5b20267 /actionmailer/lib/action_mailer/base.rb | |
| parent | 3cb46b40a0df1a1f4912625cc2be40b3d630f1f3 (diff) | |
| download | rails-a6eed86c33fbd074a08b76a678e968f521cf37b0.tar.gz rails-a6eed86c33fbd074a08b76a678e968f521cf37b0.tar.bz2 rails-a6eed86c33fbd074a08b76a678e968f521cf37b0.zip | |
Removing utils, and updating requires to match
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 3d0ac49c34..bf5e15e0e5 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -251,7 +251,7 @@ module ActionMailer #:nodoc: # and appear last in the mime encoded message. You can also pick a different order from inside a method with # +implicit_parts_order+. class Base - include AdvAttrAccessor, Quoting, Utils + include AdvAttrAccessor, Quoting include AbstractController::RenderingController include AbstractController::LocalizedCache @@ -617,11 +617,11 @@ module ActionMailer #:nodoc: if @parts.empty? main_type, sub_type = split_content_type(real_content_type) m.content_type([main_type, sub_type, ctype_attrs]) - m.body = normalize_new_lines(body) + m.body = body elsif @parts.size == 1 && @parts.first.parts.empty? main_type, sub_type = split_content_type(real_content_type) m.content_type([main_type, sub_type, ctype_attrs]) - m.body = normalize_new_lines(@parts.first.body) + m.body = @parts.first.body.encoded else @parts.each do |p| m.add_part(p) |