diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2014-03-09 04:15:11 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2014-03-09 04:15:11 +0100 |
| commit | 76ab9403af3b562531a7eb0831e5a7ecc9aedb38 (patch) | |
| tree | c4d74f0cc8aac0fcd5a52520170a64c8d4b01395 /include/onepoll.php | |
| parent | e8e980c8175be6dae7d642d9707493c465b7137b (diff) | |
| parent | 80e381176e1e301782bc56cbb7c6037825eddf2d (diff) | |
| download | volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.gz volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.bz2 volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.zip | |
merge
Diffstat (limited to 'include/onepoll.php')
| -rw-r--r-- | include/onepoll.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/onepoll.php b/include/onepoll.php index a821b76cf..e81d8bcf7 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -29,19 +29,16 @@ function onepoll_run($argv, $argc){ return; } - $d = datetime_convert(); - $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 - AND (( abook_flags = %d ) OR ( abook_flags = %d ) OR ( abook_flags & %d )) + AND (( abook_flags & %d ) OR ( abook_flags = %d )) AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", intval($contact_id), - intval(ABOOK_FLAG_HIDDEN), + intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_UNCONNECTED), intval(0), - intval(ABOOK_FLAG_PENDING), intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) ); |