From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Nov 2011 10:56:05 +0000 (+0000)
Subject: Fix object_id warning
X-Git-Tag: live~6077
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c485ae32490ccf98dcbea96af6218b25540f5eaa

Fix object_id warning
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ec2f381fc..d58bc8922 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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}")