dont set 'false' for current_user, and also dont break if id is does …

…not exist
mooktakim · Nov 8, 2010 · c4d9dc2 · c4d9dc2
1 parent 1e8b00a
commit c4d9dc2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/extensions/action_controller/base.rb b/lib/extensions/action_controller/base.rb
@@ -32,11 +32,11 @@ def redirect_back_or_default(default)
 
   def current_user
     @current_user ||= if session[:user_id]
-      User.find(session[:user_id])
+      User.find(session[:user_id]) rescue nil
     elsif cookies[:remember_token]
-      User.find_by_remember_token(cookies[:remember_token])
+      User.find_by_remember_token(cookies[:remember_token]) rescue nil
     else
-      false
+      nil
     end
   end