diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-15 14:45:18 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-15 15:57:33 +0100 |
| commit | e5a2a9fced3e5559ac139977922a0f63a53c6c5c (patch) | |
| tree | a0de1faec1f5e12e6f7ea2fd7e70bdecacde9a2d /actionmailer | |
| parent | 4598d8874948268e1162c1ef75d0bd565b1e0e64 (diff) | |
| download | rails-e5a2a9fced3e5559ac139977922a0f63a53c6c5c.tar.gz rails-e5a2a9fced3e5559ac139977922a0f63a53c6c5c.tar.bz2 rails-e5a2a9fced3e5559ac139977922a0f63a53c6c5c.zip | |
Remove URI object from ActiveResource notification, send the :mailer class in AM (like in AP#process_action) and remove locale instrumentation.
Diffstat (limited to 'actionmailer')
| -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 5b4a8c0751..b9a01356ba 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -510,7 +510,7 @@ module ActionMailer #:nodoc: begin ActiveSupport::Notifications.instrument("action_mailer.deliver", - :template => template, :mailer_name => mailer_name) do |payload| + :template => template, :mailer => self.class.name) do |payload| self.class.set_payload_for_mail(payload, mail) self.delivery_method.perform_delivery(mail) if perform_deliveries end |