diff options
| author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-24 20:38:53 +1100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-24 20:38:53 +1100 |
| commit | 73a9000402b5766e660dbf3489f5289c21c3f472 (patch) | |
| tree | fcbbb7b0161ae9299c67bcbbdcd2d51900678a73 /actionmailer/lib/action_mailer/base.rb | |
| parent | afc758297c553de467b0c434330cb703d62795f1 (diff) | |
| download | rails-73a9000402b5766e660dbf3489f5289c21c3f472.tar.gz rails-73a9000402b5766e660dbf3489f5289c21c3f472.tar.bz2 rails-73a9000402b5766e660dbf3489f5289c21c3f472.zip | |
Adding failing tests for calling just the action, instead of :create_action_name and :deliver_action_name
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index c1dc415728..e7eb6bffcd 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -387,7 +387,8 @@ module ActionMailer #:nodoc: process(method_name, *args) if method_name end - # TODO Add new delivery method goodness + # TODO: Clean this up and refactor before Rails 3.0 release. + # This works for now, but not neat def mail(headers = {}) # Guard flag to prevent both the old and the new API from firing # Should be removed when old API is deprecated @@ -446,6 +447,7 @@ module ActionMailer #:nodoc: I18n.t(:subject, :scope => [:actionmailer, mailer_scope, action_name], :default => action_name.humanize) end + # TODO: Move this into Mail def quote_fields(m, headers, charset) #:nodoc: m.subject ||= quote_if_necessary(headers[:subject], charset) if headers[:subject] m.to ||= quote_address_if_necessary(headers[:to], charset) if headers[:to] |