Replace @user with @current_user
This ensures that that we will find any more hidden references to @user that might be hanging around...
This commit is contained in:
parent
24fc94944b
commit
ebeea34670
1 changed files with 1 additions and 10 deletions
|
@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
|
||||||
|
|
||||||
before_action :fetch_body
|
before_action :fetch_body
|
||||||
|
|
||||||
|
attr_accessor :current_user
|
||||||
helper_method :current_user
|
helper_method :current_user
|
||||||
|
|
||||||
def authorize_web
|
def authorize_web
|
||||||
|
@ -468,16 +469,6 @@ class ApplicationController < ActionController::Base
|
||||||
[user, pass]
|
[user, pass]
|
||||||
end
|
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
|
# override to stop oauth plugin sending errors
|
||||||
def invalid_oauth_response; end
|
def invalid_oauth_response; end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue