about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-12-15 01:54:05 +0100
committerGitHub <noreply@github.com>2017-12-15 01:54:05 +0100
commit3d3b403359db2ccd8d6b0c873ffe57231f8615e1 (patch)
tree1892130913ce3e0223f8b292b91f8ff52e401be7 /app
parent25b0d7538eb83c5fd02409ca22345c9af752b3ed (diff)
Do not hide statuses from silenced accounts from other silenced accounts (#6030)
Diffstat (limited to 'app')
-rw-r--r--app/lib/status_filter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
index 27e1f9d30..a6a050ce1 100644
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -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?