Fix crash in MergeWorker (#14129)
Similarly to #12324, the code is passing an Account object where an id is expected.
This commit is contained in:
		
							parent
							
								
									791402af7c
								
							
						
					
					
						commit
						01a99f7ec7
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue