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

diff --cc src/Worker/Cron.php
index 1a7a5784dc253aba3654c5110912958aacd71ed4,dd4ca4da2a28a067b07f026dc2a63738717c813e..43c33103b3cf375f1798538cbc48d4b5c525686d
--- 1/src/Worker/Cron.php
--- 2/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)) {

diff --cc src/Worker/OnePoll.php
Simple merge