zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Do not hide statuses from silenced accounts from other silenced accounts (#6030)

This commit is contained in:
Eugen Rochko 2017-12-15 01:54:05 +01:00 committed by GitHub
parent 25b0d7538e
commit 3d3b403359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/status_filter.rb
View File

@ -35,7 +35,7 @@ class StatusFilter
end
def silenced_account?
status_account_silenced? && !account_following_status_account?
!account&.silenced? && status_account_silenced? && !account_following_status_account?
end
def status_account_silenced?