Don't reset the session when the token refers to an invalid user

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c2f1e644c5f928fd8da86415f5cf0bb6361816c7..f07cacbd6cb121f96a29857781bd795875190f9c 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -40,8 +40,6 @@ class ApplicationController < ActionController::Base
     elsif session[:token]
       if @user = User.authenticate(:token => session[:token])
         session[:user] = @user.id
-      else
-        reset_session
       end
     end
   rescue Exception => ex