Merge remote-tracking branch 'parent/stable-4.2' into kb-draft-5.25-lts

2024-09-30 21:41:34 +09:00 · 2024-09-30 21:41:34 +09:00 · c33fea88b2
commit c33fea88b2
parent 3c851f2d21 7e47439787
15 changed files with 68 additions and 38 deletions
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@ -594,7 +594,7 @@ class FeedManager
      arr = crutches[:active_mentions][s.id] || []
      arr.push(s.account_id)

-      if s.reblog?
+      if s.reblog? && s.reblog.present?
        arr.push(s.reblog.account_id)
        arr.concat(crutches[:active_mentions][s.reblog_of_id] || [])
      end