cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix object_id warning

Browse source
This commit is contained in:
Tom Hughes 2011-11-07 10:56:05 +00:00
parent 2f77efe7e6
commit c485ae3249
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/application_controller.rb
View file

@ -35,8 +35,9 @@ class ApplicationController < ActionController::Base
end
end
elsif session[:token]
@user = User.authenticate(:token => session[:token])
session[:user] = @user.id
if @user = User.authenticate(:token => session[:token])
session[:user] = @user.id
end
end
rescue Exception => ex
logger.info("Exception authorizing user: #{ex.to_s}")