aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-08 16:15:48 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-08 21:36:04 +0100
commit802b08da0075bf6426c723957447ed85dc849bba (patch)
tree6997cfbf4e9c01776316e9c8895b5f1f4e6473a8
parent7045c4c279499eb7340fb420398d613497739eef (diff)
downloadrails-802b08da0075bf6426c723957447ed85dc849bba.tar.gz
rails-802b08da0075bf6426c723957447ed85dc849bba.tar.bz2
rails-802b08da0075bf6426c723957447ed85dc849bba.zip
Mailer should give self as payload because it contains all the information needed (as the template rendered and the mailer name).
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index e644c47e9c..597260ab0b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -499,7 +499,7 @@ module ActionMailer #:nodoc:
logger.debug "\n#{mail.encoded}"
end
- ActiveSupport::Notifications.instrument("action_mailer.deliver", :mail => mail) do
+ ActiveSupport::Notifications.instrument("action_mailer.deliver", :mail => self) do
begin
self.delivery_method.perform_delivery(mail) if perform_deliveries
rescue Exception => e # Net::SMTP errors or sendmail pipe errors