diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-23 15:43:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 15:43:27 +0100 |
| commit | 23677bc51e657522049fb904e626f81f577de515 (patch) | |
| tree | dc9417c57a3af3036d621940a751e9adf1b09ce3 /app/controllers/api_controller.rb | |
| parent | 1e95fbb10b81ea0eedcb39a83e52f42e3dbb456c (diff) | |
| parent | 82191b33831f26e071a27dd59ce2e46fb467589c (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/controllers/api_controller.rb')
| -rw-r--r-- | app/controllers/api_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 862358d6e..a3a2a3275 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -59,7 +59,7 @@ class ApiController < ApplicationController end def current_resource_owner - User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token + @current_user ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token end def current_user |