diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-23 16:40:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 16:40:01 +0200 |
| commit | 01a99f7ec7ce892a3d953a6792515882a04ffee3 (patch) | |
| tree | 2df78fc13c7df6816b5ed7f772823567f864b029 | |
| parent | 791402af7c33da5c8f60200b389701400f73fde8 (diff) | |
| download | mastodon-01a99f7ec7ce892a3d953a6792515882a04ffee3.tar mastodon-01a99f7ec7ce892a3d953a6792515882a04ffee3.tar.gz mastodon-01a99f7ec7ce892a3d953a6792515882a04ffee3.tar.bz2 mastodon-01a99f7ec7ce892a3d953a6792515882a04ffee3.zip | |
Fix crash in MergeWorker (#14129)
Similarly to #12324, the code is passing an Account object where an id
is expected.
| -rw-r--r-- | app/lib/feed_manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 94872d050..efb4f6e2c 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -106,7 +106,7 @@ class FeedManager crutches = build_crutches(into_account.id, statuses) statuses.each do |status| - next if filter_from_home?(status, into_account, crutches) + next if filter_from_home?(status, into_account.id, crutches) add_to_feed(:home, into_account.id, status, aggregate) end |