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/poller.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/poller.php')
| -rw-r--r-- | include/poller.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/poller.php b/include/poller.php index 649da30f6..423ee46c1 100644 --- a/include/poller.php +++ b/include/poller.php @@ -184,9 +184,7 @@ function poller_run($argv, $argc){ if(! $restart) proc_run('php','include/cronhooks.php'); - // Only poll from those with suitable relationships, - // and which have a polling address and ignore Diaspora since - // we are unable to match those posts with a Diaspora GUID and prevent duplicates. + // Only poll from those with suitable relationships $abandon_sql = (($abandon_days) ? sprintf(" AND account_lastlog > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) @@ -197,10 +195,9 @@ function poller_run($argv, $argc){ $contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_channel FROM abook LEFT JOIN account on abook_account = account_id where 1 $sql_extra - AND (( abook_flags = %d ) OR ( abook_flags = %d )) + AND (( abook_flags & %d ) OR ( abook_flags = %d )) AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY RAND()", - - intval(ABOOK_FLAG_HIDDEN), + intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_UNCONNECTED), intval(0), intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) // FIXME |