diff options
| author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-26 11:46:42 +0100 |
|---|---|---|
| committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-26 11:46:42 +0100 |
| commit | 39a1b06f13221e00ab38dff960155cb5fe9eaabb (patch) | |
| tree | 84fd33338a523b75b89dded8c2a5a8b812c7f136 /actionmailer/lib/action_mailer/delivery_methods.rb | |
| parent | 9dd65c368b40093cfc686956a48c18b78abacf7f (diff) | |
| download | rails-39a1b06f13221e00ab38dff960155cb5fe9eaabb.tar.gz rails-39a1b06f13221e00ab38dff960155cb5fe9eaabb.tar.bz2 rails-39a1b06f13221e00ab38dff960155cb5fe9eaabb.zip | |
Deprecate old defaults API.
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_methods.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_methods.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb index 34bfe6000a..f6321a240c 100644 --- a/actionmailer/lib/action_mailer/delivery_methods.rb +++ b/actionmailer/lib/action_mailer/delivery_methods.rb @@ -65,7 +65,10 @@ module ActionMailer method ||= self.delivery_method mail.delivery_handler = self - if method.is_a?(Symbol) + case method + when NilClass + raise "Delivery method cannot be nil" + when Symbol if klass = delivery_methods[method.to_sym] mail.delivery_method(klass, send(:"#{method}_settings")) else |