There's no reason to query the db with NULLs

Signed-off-by: Michael Bleigh <michael@intridea.com>
mbleigh · Apr 28, 2009 · f5c1d1d · f5c1d1d
1 parent a545b5f
commit f5c1d1d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/twitter_auth/controller_extensions.rb b/lib/twitter_auth/controller_extensions.rb
@@ -20,7 +20,14 @@ def authentication_succeeded(message = 'You have logged in successfully.', desti
     end
 
     def current_user
-      @current_user ||= User.find_by_id(session[:user_id]) || User.from_remember_token(cookies[:remember_token])
+      @current_user = 
+        if session[:user_id]
+          User.find_by_id(session[:user_id])
+        elsif cookies[:remember_token]
+          User.from_remember_token(cookies[:remember_token])
+        else
+          false
+        end
     end
 
     def current_user=(new_user)