]> cat aescling's git repositories - mastodon.git/commitdiff
Do not hide statuses from silenced accounts from other silenced accounts (#6030)
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 15 Dec 2017 00:54:05 +0000 (01:54 +0100)
committerGitHub <noreply@github.com>
Fri, 15 Dec 2017 00:54:05 +0000 (01:54 +0100)
app/lib/status_filter.rb

index 27e1f9d30fc7ab344681c7b573f9aa28a7e30ac0..a6a050ce1d832559f1c85435cf49155ee49cacc8 100644 (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?