X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f0d7c4a8d6373faa02ed941452ef904ee43ec447..95d899786a1bbabacc0cd12ef1c4814118d9d0de:/app/controllers/application_controller.rb?ds=sidebyside

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b9f98071c..ec2f381fc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,12 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
 
   if STATUS == :database_readonly or STATUS == :database_offline
-    session :off
+    after_filter :clear_session
+    wrap_parameters false
+
+    def clear_session
+      session.clear
+    end
 
     def self.cache_sweeper(*sweepers)
     end
@@ -106,9 +111,7 @@ class ApplicationController < ActionController::Base
   # is optional.
   def setup_user_auth
     # try and setup using OAuth
-    if Authenticator.new(self, [:token]).allow?
-      @user = current_token.user
-    else
+    if not Authenticator.new(self, [:token]).allow?
       username, passwd = get_auth_data # parse from headers
       # authenticate per-scheme
       if username.nil?
@@ -358,6 +361,11 @@ private
     return [user, pass] 
   end 
 
+  # used by oauth plugin to set the current user
+  def current_user=(user)
+    @user=user
+  end
+
   # override to stop oauth plugin sending errors
   def invalid_oauth_response
   end