X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dd905b5aa893918168c644045aa1b6069e95d48e..4a1f0da82349888796ba2c0c52868228f0fa9c70:/app/controllers/application_controller.rb?ds=inline

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c830d4bcd..488e6a818 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -44,8 +44,6 @@ class ApplicationController < ActionController::Base
           redirect_to :controller => "users", :action => "terms", :referer => request.fullpath
         end
       end
-    elsif session[:token]
-      session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token])
     end
 
     session[:fingerprint] = current_user.fingerprint if current_user && session[:fingerprint].nil?
@@ -199,7 +197,7 @@ class ApplicationController < ActionController::Base
   ##
   # wrap a web page in a timeout
   def web_timeout(&block)
-    Timeout.timeout(Settings.web_timeout, Timeout::Error, &block)
+    Timeout.timeout(Settings.web_timeout, &block)
   rescue ActionView::Template::Error => e
     e = e.cause