From 39a1b06f13221e00ab38dff960155cb5fe9eaabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim=20and=20Mikel=20Lindsaar?=
 <pair@programming.com>
Date: Tue, 26 Jan 2010 11:46:42 +0100
Subject: Deprecate old defaults API.

---
 actionmailer/lib/action_mailer/delivery_methods.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'actionmailer/lib/action_mailer/delivery_methods.rb')

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
-- 
cgit v1.2.3