From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Jul 2017 18:44:14 +0000 (+0100)
Subject: Replace @user with @current_user
X-Git-Tag: live~3309^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ebeea34670ed0fca539daef0e7a10887d839e6d2

Replace @user with @current_user

This ensures that that we will find any more hidden references
to @user that might be hanging around...
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a367a1b0a..68fc4338e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
 
   before_action :fetch_body
 
+  attr_accessor :current_user
   helper_method :current_user
 
   def authorize_web
@@ -468,16 +469,6 @@ class ApplicationController < ActionController::Base
     [user, pass]
   end
 
-  # used to get the current logged in user
-  def current_user
-    @user
-  end
-
-  # used to set the current logged in user
-  def current_user=(user)
-    @user = user
-  end
-
   # override to stop oauth plugin sending errors
   def invalid_oauth_response; end
 end