From 33d4a7f0fcd94b6f9629596199f598350ecfbb45 Mon Sep 17 00:00:00 2001 From: Coleman Date: Fri, 17 Oct 2008 01:01:57 -0500 Subject: [PATCH] use different class variable to determine currently logged in user --- app/controllers/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 4a20013..e72a272 100644 --- 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