aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/delivery_methods.rb
diff options
context:
space:
mode:
authorJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-25 13:39:48 +1100
committerJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-25 13:39:48 +1100
commite4a989e9d99b9860859ad14b5a6fca62a4009cf9 (patch)
tree3c1f8c125517c17d5709f3c7545199e2e59cd941 /actionmailer/lib/action_mailer/delivery_methods.rb
parente1c131863897390d04bd5515765236590747f2c1 (diff)
downloadrails-e4a989e9d99b9860859ad14b5a6fca62a4009cf9.tar.gz
rails-e4a989e9d99b9860859ad14b5a6fca62a4009cf9.tar.bz2
rails-e4a989e9d99b9860859ad14b5a6fca62a4009cf9.zip
Added delivery_handler method to mail and implemented in ActionMailer to deliver inside of instrumentation
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_methods.rb')
-rw-r--r--actionmailer/lib/action_mailer/delivery_methods.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb
index 21909d5d57..7a6b410932 100644
--- a/actionmailer/lib/action_mailer/delivery_methods.rb
+++ b/actionmailer/lib/action_mailer/delivery_methods.rb
@@ -63,7 +63,7 @@ module ActionMailer
def wrap_delivery_behavior(mail, method=nil) #:nodoc:
method ||= self.delivery_method
- mail.register_for_delivery_notification(self)
+ mail.delivery_handler = self
if method.is_a?(Symbol)
if klass = delivery_methods[method.to_sym]