Fixed name space conflict.
This commit is contained in:
parent
25757cfe70
commit
0dd055f2eb
1 changed files with 3 additions and 3 deletions
|
@ -94,9 +94,9 @@ class ApplicationController < ActionController::Base
|
|||
|
||||
# check logon session
|
||||
if params['logon_session']
|
||||
session = ActiveRecord::SessionStore::Session.where( :session_id => params['logon_session'] ).first
|
||||
if session
|
||||
userdata = User.find( user_id = session.data[:user_id] )
|
||||
logon_session = ActiveRecord::SessionStore::Session.where( :session_id => params['logon_session'] ).first
|
||||
if logon_session
|
||||
userdata = User.find( user_id = logon_session.data[:user_id] )
|
||||
end
|
||||
|
||||
# set logon session user to current user
|
||||
|
|
Loading…
Reference in a new issue