Do not call after sign in hook without resource, closes #1666.

heartcombo · Mar 3, 2012 · 2f6ecc1 · 2f6ecc1
1 parent b932888
commit 2f6ecc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devise (2.0.2)
+    devise (2.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       railties (~> 3.1)

diff --git a/app/controllers/devise_controller.rb b/app/controllers/devise_controller.rb
@@ -89,8 +89,7 @@ def require_no_authentication
       warden.authenticated?(resource_name)
     end
 
-    if authenticated
-      resource = warden.user(resource_name)
+    if authenticated && resource = warden.user(resource_name)
       flash[:alert] = I18n.t("devise.failure.already_authenticated")
       redirect_to after_sign_in_path_for(resource)
     end