mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Mailer should give self as payload because it contains all the information needed (as the template rendered and the mailer name).

This commit is contained in:
José Valim 2010-01-08 16:15:48 +01:00
parent 7045c4c279
commit 802b08da00
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionmailer/lib/action_mailer/base.rb
View File

@ -499,7 +499,7 @@ module ActionMailer #:nodoc:
logger.debug "\n#{mail.encoded}" logger.debug "\n#{mail.encoded}"
end end
ActiveSupport::Notifications.instrument("action_mailer.deliver", :mail => mail) do ActiveSupport::Notifications.instrument("action_mailer.deliver", :mail => self) do
begin begin
self.delivery_method.perform_delivery(mail) if perform_deliveries self.delivery_method.perform_delivery(mail) if perform_deliveries
rescue Exception => e # Net::SMTP errors or sendmail pipe errors rescue Exception => e # Net::SMTP errors or sendmail pipe errors