Allow model configuration to be set to nil.

heartcombo · Oct 29, 2009 · eb4437a · eb4437a
1 parent 5172d50
commit eb4437a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -5,6 +5,7 @@
 
 * bug fix
   * Do not redirect on invalid authenticate
+  * Allow model configuration to be set to nil
 
 == 0.2.2
 

diff --git a/lib/devise.rb b/lib/devise.rb
@@ -38,7 +38,9 @@ def #{accessor}
 
     mod.const_get(:ClassMethods).class_eval <<-METHOD, __FILE__, __LINE__
       def #{accessor}
-        @#{accessor} || if superclass.respond_to?(:#{accessor})
+        if defined?(@#{accessor})
+          @#{accessor}
+        elsif superclass.respond_to?(:#{accessor})
           superclass.#{accessor}
         else
           Devise.#{accessor}