diff options
| author | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-05-17 13:28:23 +0000 |
| commit | 65d98af24c3c7b784f7e2c95998df65901011ce3 (patch) | |
| tree | d7d6a60698d7a0c3704ea55cb71c543285186b17 /Zotlabs/Daemon/Onepoll.php | |
| parent | a57739c462a7991bf2130e8eca0c383eb276f0cd (diff) | |
| parent | 62d35627f35537d0056482047e74a27ad837c3cf (diff) | |
| download | volse-hubzilla-8.4.tar.gz volse-hubzilla-8.4.tar.bz2 volse-hubzilla-8.4.zip | |
Merge branch '8.4RC'8.4
Diffstat (limited to 'Zotlabs/Daemon/Onepoll.php')
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index bde39007e..973bcf402 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -30,14 +30,10 @@ class Onepoll { $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 $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), - intval(ACCOUNT_OK), - intval(ACCOUNT_UNVERIFIED) + $contacts = q("SELECT abook.*, xchan.* FROM abook + LEFT JOIN xchan ON xchan_hash = abook_xchan + WHERE abook_id = %d", + intval($contact_id) ); if (!$contacts) { |