diff options
| author | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
| commit | 78429926bcf1ab7e8a4d35d0093ba666b3568708 (patch) | |
| tree | f9f1d219ecbbaa52982e1f26b842e1e824b68c85 /include/onepoll.php | |
| parent | a2ea560bf397902ce5608daabf101d0bcf813f13 (diff) | |
| parent | df3574663944f50820e2d50cfb9d87f505ceff54 (diff) | |
| download | volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.gz volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.bz2 volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/onepoll.php')
| -rw-r--r-- | include/onepoll.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/onepoll.php b/include/onepoll.php index 42bce0f68..a64922aa3 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()), |