Fixing merge & local pinned post leak

This commit is contained in:
Darius Kazemi
2020-05-16 13:01:41 -07:00
parent 877a478466
commit c7a78558ea
3 changed files with 6 additions and 26 deletions

View File

@ -26,7 +26,11 @@ class AccountsController < ApplicationController
return
end
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
if current_user.nil?
@pinned_statuses = cache_collection(@account.pinned_statuses.without_local_only, Status) if show_pinned_statuses?
else
@pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
end
@statuses = filtered_status_page
@statuses = cache_collection(@statuses, Status)
@rss_url = rss_url