diff options
| author | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
|---|---|---|
| committer | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
| commit | a75c61d71efebf43713026200aa0f513bd7eef09 (patch) | |
| tree | 909048adeaa329813e2530d43626ed3bd711bc25 /Zotlabs/Daemon/Poller.php | |
| parent | 481ecee9e87342ca7a1217395085e95d1a3b61ea (diff) | |
| parent | 0d0f73fb67bbfcc53058cefded85ac36f951c7a7 (diff) | |
| download | volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.gz volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.bz2 volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Daemon/Poller.php')
| -rw-r--r-- | Zotlabs/Daemon/Poller.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index 762f1349c..88213a7c9 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -69,11 +69,11 @@ class Poller { abook.abook_channel, abook.abook_id, abook.abook_archived, abook.abook_pending, abook.abook_ignored, abook.abook_blocked, xchan.xchan_network, - account.account_lastlog, account.account_flags - FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash + account.account_lastlog, account.account_flags + FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash LEFT JOIN account on abook_account = account_id where abook_self = 0 - $sql_extra + $sql_extra AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc", intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) // FIXME @@ -102,8 +102,7 @@ class Poller { continue; } - - if (!in_array($contact['xchan_network'], ['zot', 'zot6'])) + if ($contact['xchan_network'] !== 'zot6') continue; if ($c == $t) { @@ -191,7 +190,7 @@ class Poller { set_config('system', 'lastpoll', datetime_convert()); - //All done - clear the lockfile + //All done - clear the lockfile @unlink($lockfile); |