diff options
| author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-23 12:46:33 +0100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-23 12:46:40 +0100 |
| commit | c985a0ee3d9ae279fd02814ca60782e2f93215e4 (patch) | |
| tree | 8a20b922033e8c38371076f17669e6167389c373 /actionmailer/lib/action_mailer/base.rb | |
| parent | 6ba944608e527b8d7fc564a6e450e2d4c4355ddb (diff) | |
| download | rails-c985a0ee3d9ae279fd02814ca60782e2f93215e4.tar.gz rails-c985a0ee3d9ae279fd02814ca60782e2f93215e4.tar.bz2 rails-c985a0ee3d9ae279fd02814ca60782e2f93215e4.zip | |
Add some tests to collector with templates and any.
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 5e61b8693a..4ab3761807 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/class' require 'active_support/core_ext/module/delegation' require 'mail' require 'action_mailer/tmail_compat' +require 'action_mailer/collector' module ActionMailer #:nodoc: # Action Mailer allows you to send email from your application using a mailer model and views. @@ -442,7 +443,6 @@ module ActionMailer #:nodoc: end content_type ||= create_parts_from_responses(m, responses, charset) - m.content_type = content_type m.charset = charset m.mime_version = mime_version |