use different class variable to determine currently logged in user

2008-10-17 01:01:57 -05:00 · 2008-10-17 01:01:57 -05:00 · 33d4a7f0fc
parent 0238d49415
commit 33d4a7f0fc
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@ -5,7 +5,7 @@ class Application < Merb::Controller
  
  def current_user
    if session[:user_id]
-      (@user ||= User.find(session[:user_id]))
+      (@_user ||= User.find(session[:user_id]))
    else
      (cookies[:session_id] ||= session[:session_id])
    end