X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fonepoll.php;h=a64922aa323e808576df96416335eaec910622ca;hb=30f3a16874fd32b55dfbe079afe2470f7ce86e2e;hp=51516d0598820d56fc0d2d1128016ceb06e390ed;hpb=4ff2e9a10358e68f7af90ebf6d50d75d3a6ed284;p=friendica.git

diff --git a/include/onepoll.php b/include/onepoll.php
index 51516d0598..a64922aa32 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -25,6 +25,7 @@ function onepoll_run($argv, $argc){
 	require_once('include/email.php');
 	require_once('include/socgraph.php');
 	require_once('include/pidfile.php');
+	require_once('include/queue_fn.php');
 
 	load_config('config');
 	load_config('system');
@@ -54,6 +55,9 @@ function onepoll_run($argv, $argc){
 		return;
 	}
 
+	if(was_recently_delayed($contact_id))
+		return;
+
 	$d = datetime_convert();
 
 	// Only poll from those with suitable relationships,
@@ -452,7 +456,7 @@ function onepoll_run($argv, $argc){
 
 	if($xml) {
 		logger('poller: received xml : ' . $xml, LOGGER_DATA);
-			if(! strstr($xml,'<?xml')) {
+			if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) {
 			logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
 			$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
 				dbesc(datetime_convert()),
@@ -506,7 +510,7 @@ function onepoll_run($argv, $argc){
 	}
 	if(count($r)) {
 		if(! $r[0]['total']) {
-			poco_load($contact['id'],$importer_uid,$contact['poco']);
+			poco_load($contact['id'],$importer_uid,0,$contact['poco']);
 		}
 	}