diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-13 05:03:48 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-13 05:03:48 +0000 |
| commit | c3ff04b05db1da913640481b79f75e51e804ed11 (patch) | |
| tree | 5a9de9f2783b5186fab69eeaaeb44937f7a83ea8 /actionmailer/lib/action_mailer | |
| parent | f0753992ab8cc9bbbf9b047fdc56f8899df5635e (diff) | |
| download | rails-c3ff04b05db1da913640481b79f75e51e804ed11.tar.gz rails-c3ff04b05db1da913640481b79f75e51e804ed11.tar.bz2 rails-c3ff04b05db1da913640481b79f75e51e804ed11.zip | |
Allow mailer actions named send by using __send__ internally. Closes #6467.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 444bea95e0..b256016d94 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -369,7 +369,7 @@ module ActionMailer #:nodoc: # rendered and a new TMail::Mail object created. def create!(method_name, *parameters) #:nodoc: initialize_defaults(method_name) - send(method_name, *parameters) + __send__(method_name, *parameters) # If an explicit, textual body has not been set, we check assumptions. unless String === @body @@ -428,7 +428,7 @@ module ActionMailer #:nodoc: logger.info "Sent mail:\n #{mail.encoded}" unless logger.nil? begin - send("perform_delivery_#{delivery_method}", mail) if perform_deliveries + __send__("perform_delivery_#{delivery_method}", mail) if perform_deliveries rescue Exception => e # Net::SMTP errors or sendmail pipe errors raise e if raise_delivery_errors end |