about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-15 01:17:12 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-15 01:17:12 +0000
commit37254c4f5d1f4397551c94e59a4d474f444b1d9a (patch)
tree8975374e2cbfced954f1bfc6de6de2652ceccf30 /app/lib
parente5a9831a56e7fdc0a767f0d8a059bebeabeed22f (diff)
parent098c7d27fe3a2d35d555f415717b9e019504dd91 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/lib')
-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?