From: Michael <heluecht@pirati.ca>
Date: Sun, 3 Dec 2017 13:45:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into onepoll
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f988ed5d15e3697daa41e9a4ee3ac9951ef4c7cc;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into onepoll
---

f988ed5d15e3697daa41e9a4ee3ac9951ef4c7cc
diff --cc src/Worker/Cron.php
index 1a7a5784dc,dd4ca4da2a..43c33103b3
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@@ -153,23 -153,19 +153,22 @@@ Class Cron 
  			: ''
  		);
  
 -		$contacts = q("SELECT `contact`.`id` FROM `user`
 +		$contacts = q("SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`,
 +					`contact`.`last-update`, `contact`.`priority`, `contact`.`subhub`
 +				FROM `user`
  				STRAIGHT_JOIN `contact`
  				ON `contact`.`uid` = `user`.`uid` AND `contact`.`rel` IN (%d, %d) AND `contact`.`poll` != ''
- 					AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra
 -					AND `contact`.`network` IN ('%s', '%s', '%s', '%s') $sql_extra
++					AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra
  					AND NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly`
  					AND NOT `contact`.`archive`
 -				WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
 +				WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
  			intval(CONTACT_IS_SHARING),
  			intval(CONTACT_IS_FRIEND),
  			dbesc(NETWORK_DFRN),
  			dbesc(NETWORK_OSTATUS),
 +			dbesc(NETWORK_DIASPORA),
  			dbesc(NETWORK_FEED),
- 			dbesc(NETWORK_MAIL),
- 			dbesc(NETWORK_MAIL2)
+ 			dbesc(NETWORK_MAIL)
  		);
  
  		if (!DBM::is_result($contacts)) {