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
This commit is contained in:
1 parent
9b53c7d353
commit
4bdb6a0eaf
5 files changed
+30
-6
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user