mastofe

commit: 3d3b403359db2ccd8d6b0c873ffe57231f8615e1
parent: 25b0d7538eb83c5fd02409ca22345c9af752b3ed
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 15 Dec 2017 01:54:05 +0100

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


Diffstat:
M
app/lib/status_filter.rb
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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?