Merge pull request #7114 from annando/update-ap
Make 7113 really work - now the query does contain AP
This commit is contained in:
		
				commit
				
					
						10b5ea825d
					
				
			
		
					 1 changed files with 2 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -177,9 +177,10 @@ class Cron
 | 
			
		|||
				FROM `user`
 | 
			
		||||
				STRAIGHT_JOIN `contact`
 | 
			
		||||
				ON `contact`.`uid` = `user`.`uid` AND `contact`.`poll` != ''
 | 
			
		||||
					AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra
 | 
			
		||||
					AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra
 | 
			
		||||
					AND NOT `contact`.`self` AND NOT `contact`.`blocked`
 | 
			
		||||
				WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
 | 
			
		||||
			DBA::escape(Protocol::ACTIVITYPUB),
 | 
			
		||||
			DBA::escape(Protocol::DFRN),
 | 
			
		||||
			DBA::escape(Protocol::OSTATUS),
 | 
			
		||||
			DBA::escape(Protocol::DIASPORA),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue