diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-08-30 11:00:23 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-08-30 11:00:23 +0200 |
| commit | d0926240a87327a7e38b822802ac192336f68791 (patch) | |
| tree | 49c5d2eec9954efbe313e7130e1ce970a56c60e9 /include/poller.php | |
| parent | 97806544bcd7ee3831ffc515062afe0812828b76 (diff) | |
| parent | 0f1bc6e9571e367b37246e43ce08921bf317fa7c (diff) | |
| download | volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.tar.gz volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.tar.bz2 volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'include/poller.php')
| -rw-r--r-- | include/poller.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/poller.php b/include/poller.php index 651736a99..e80b696bf 100644 --- a/include/poller.php +++ b/include/poller.php @@ -82,12 +82,18 @@ 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. + $contacts = q("SELECT `id` FROM `contact` WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' + AND `network` != '%s' $sql_extra AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()", intval(CONTACT_IS_SHARING), - intval(CONTACT_IS_FRIEND) + intval(CONTACT_IS_FRIEND), + dbesc(NETWORK_DIASPORA) ); if(! count($contacts)) { |