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 | |
| 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')
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 5 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/utils.rb | 7 |
3 files changed, 5 insertions, 13 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 3eb385d3b0..15555af19e 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -40,7 +40,6 @@ module ActionMailer autoload :Quoting, 'action_mailer/quoting' autoload :TestCase, 'action_mailer/test_case' autoload :TestHelper, 'action_mailer/test_helper' - autoload :Utils, 'action_mailer/utils' end @@ -54,5 +53,5 @@ end autoload :MailHelper, 'action_mailer/mail_helper' -gem 'mail', '>= 1.2.8' -require 'mail'
\ No newline at end of file +gem 'mail', '>= 1.2.9' +require 'mail' 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) diff --git a/actionmailer/lib/action_mailer/utils.rb b/actionmailer/lib/action_mailer/utils.rb deleted file mode 100644 index 26d2e60aaf..0000000000 --- a/actionmailer/lib/action_mailer/utils.rb +++ /dev/null @@ -1,7 +0,0 @@ -module ActionMailer - module Utils #:nodoc: - def normalize_new_lines(text) - text.to_s.gsub(/\r\n?/, "\n") - end - end -end |