diff options
| author | marijus <mario@mariovavti.com> | 2014-08-24 14:30:12 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-24 14:30:12 +0200 |
| commit | 5a080881c59fae817b9c23a72e89525edf2f1f59 (patch) | |
| tree | fa39a2011fcf22a5347b92637c5a30fb17514938 | |
| parent | c2d813325306bead8502291e36b036ed11ef1207 (diff) | |
| parent | d57c57ad59f311aa8d1488a6985874bae7beae38 (diff) | |
| download | volse-hubzilla-5a080881c59fae817b9c23a72e89525edf2f1f59.tar.gz volse-hubzilla-5a080881c59fae817b9c23a72e89525edf2f1f59.tar.bz2 volse-hubzilla-5a080881c59fae817b9c23a72e89525edf2f1f59.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | include/onepoll.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/onepoll.php b/include/onepoll.php index e81d8bcf7..947e936ac 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -35,10 +35,12 @@ function onepoll_run($argv, $argc){ 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 )) + AND NOT ( abook_flags & %d ) AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", intval($contact_id), intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_UNCONNECTED), intval(0), + intval(ABOOK_FLAG_ARCHIVED|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_IGNORED), intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) ); |