From 4bdb6a0eaffb39fb953689729c9fcf772c7128d6 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 23 Nov 2016 09:20:34 +0100 Subject: Rename "publish" to "toot" in english locale, fix lightbox showing old image before loading new one, cache notifications API, fix missing follow button on public profiles --- app/controllers/api_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/api_controller.rb') diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index a008f4c1b..a3a2a3275 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -59,11 +59,11 @@ class ApiController < ApplicationController end def current_resource_owner - @user ||= 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 - @user ||= super || current_resource_owner + super || current_resource_owner rescue ActiveRecord::RecordNotFound nil end -- cgit