aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-11-07 16:05:17 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-11-07 16:05:17 +0000
commit57cde631383a8a0fa8d231ac1ae85ea725e12cd5 (patch)
tree085048b9a8aa2456b4842cf45af66bde320615b8 /actionmailer/lib
parent6b018e3d08c52417034cd648952668192327a9b7 (diff)
downloadrails-57cde631383a8a0fa8d231ac1ae85ea725e12cd5.tar.gz
rails-57cde631383a8a0fa8d231ac1ae85ea725e12cd5.tar.bz2
rails-57cde631383a8a0fa8d231ac1ae85ea725e12cd5.zip
Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) (closes #10033) [zdennis]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8111 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 51371ef2e0..8bf051c99f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -248,8 +248,8 @@ module ActionMailer #:nodoc:
@@raise_delivery_errors = true
cattr_accessor :raise_delivery_errors
- @@delivery_method = :smtp
- cattr_accessor :delivery_method
+ superclass_delegating_accessor :delivery_method
+ self.delivery_method = :smtp
@@perform_deliveries = true
cattr_accessor :perform_deliveries