diff options
| author | Max Kostikov <max@kostikov.co> | 2021-02-27 19:47:26 +0000 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2021-02-27 19:47:26 +0000 |
| commit | 1d899d387e89b67245249204249052bf7b65f5c1 (patch) | |
| tree | 86b8ed42e016bb9cbfcb5ececbc03585a941a23a /Zotlabs/Daemon/Onepoll.php | |
| parent | 5440a65607f3c67cc6ecacbf2d54c5895e5bc212 (diff) | |
| parent | fbb1d6aa41d9eb7a27b4a8bc79747ac0797db0c7 (diff) | |
| download | volse-hubzilla-1d899d387e89b67245249204249052bf7b65f5c1.tar.gz volse-hubzilla-1d899d387e89b67245249204249052bf7b65f5c1.tar.bz2 volse-hubzilla-1d899d387e89b67245249204249052bf7b65f5c1.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!2
Diffstat (limited to 'Zotlabs/Daemon/Onepoll.php')
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 85394c8d0..598cf28e4 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -23,9 +23,15 @@ class Onepoll { return; } + $sql_extra = ''; + $allow_feeds = get_config('system', 'feed_contacts'); + if(!$allow_feeds) { + $sql_extra = ' and abook_feed = 0 '; + } + $contacts = q("SELECT abook.*, xchan.*, account.* FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan - where abook_id = %d + where abook_id = %d $sql_extra and abook_pending = 0 and abook_archived = 0 and abook_blocked = 0 and abook_ignored = 0 AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", intval($contact_id), |