clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael
2017-12-03 13:45:48 +00:00
parent cd55c742e8 239a0d70ad
commit f988ed5d15
16 changed files with 86 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Worker/Cron.php
View File

@@ -158,7 +158,7 @@ Class Cron {
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', '%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",
@@ -168,8 +168,7 @@ Class Cron {
dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_FEED),
dbesc(NETWORK_MAIL),
dbesc(NETWORK_MAIL2)
dbesc(NETWORK_MAIL)
);
if (!DBM::is_result($contacts)) {