diff options
| author | marijus <mario@mariovavti.com> | 2014-03-05 17:03:38 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-03-05 17:03:38 +0100 |
| commit | 6cdc25ade96c4451e87af475a6e4f0490b591c36 (patch) | |
| tree | 474ebb0f31063805d8b95dcddc22d4345c989936 /include/onepoll.php | |
| parent | ffb791968e48b5699dc99fffccc562f198f86c5d (diff) | |
| parent | d58abc0230e07663ce543088c186639d36f82f02 (diff) | |
| download | volse-hubzilla-6cdc25ade96c4451e87af475a6e4f0490b591c36.tar.gz volse-hubzilla-6cdc25ade96c4451e87af475a6e4f0490b591c36.tar.bz2 volse-hubzilla-6cdc25ade96c4451e87af475a6e4f0490b591c36.zip | |
Merge branch 'master' of https://github.com/friendica/red
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) ); |