diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-06-08 05:22:01 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-06-08 05:22:01 -0400 |
| commit | df2d18160212ec546ec640dd1d2152fecada5557 (patch) | |
| tree | 126504df4e5ab2d42defbee153a748fe40253b38 /Zotlabs/Daemon | |
| parent | ed17e8a6499e48b032393be351c39f31a0edcbf3 (diff) | |
| parent | 7bf1c5f27b8b8f0eea226e81a5db99585c5a56b3 (diff) | |
| download | volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.tar.gz volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.tar.bz2 volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.zip | |
Merge branch 'dev' of framagit.org:hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Deliver.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Daemon/Poller.php | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php index 394a7bf3e..b809cba91 100644 --- a/Zotlabs/Daemon/Deliver.php +++ b/Zotlabs/Daemon/Deliver.php @@ -75,6 +75,8 @@ class Deliver { q("delete from dreport where dreport_queue = '%s'", dbesc($argv[$x]) ); + + continue; } } diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php index e4bc9c143..49151437c 100644 --- a/Zotlabs/Daemon/Poller.php +++ b/Zotlabs/Daemon/Poller.php @@ -71,14 +71,18 @@ class Poller { $randfunc = db_getfunc('RAND'); - $contacts = q("SELECT * FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash + $contacts = q("SELECT abook.abook_updated, abook.abook_connected, abook.abook_feed, + 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 LEFT JOIN account on abook_account = account_id where abook_self = 0 $sql_extra AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc", intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) // FIXME - ); if($contacts) { |