X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=e80b696bf8615f9ca89df7963f01a76f1cd4d9c1;hb=d284f8017cefb79571fe51c4ae3f85b9b4e517c9;hp=651736a99a82844c317e3e7fd7bb7bedfa780131;hpb=5b24050875bc0b2edfee92005bba7c5ef7a17cab;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index 651736a99a..e80b696bf8 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)) {