Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed name space conflict.

Browse source
This commit is contained in:
Martin Edenhofer 2012-04-20 09:06:45 +02:00
parent 25757cfe70
commit 0dd055f2eb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/application_controller.rb
View file

@ -94,9 +94,9 @@ class ApplicationController < ActionController::Base
# check logon session # check logon session
if params['logon_session'] if params['logon_session']
session = ActiveRecord::SessionStore::Session.where( :session_id => params['logon_session'] ).first logon_session = ActiveRecord::SessionStore::Session.where( :session_id => params['logon_session'] ).first
if session if logon_session
userdata = User.find( user_id = session.data[:user_id] ) userdata = User.find( user_id = logon_session.data[:user_id] )
end end
# set logon session user to current user # set logon session user to current user