clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'mexon-mat/mergerequest' into develop

This commit is contained in:
Fabrixxm 2015-02-10 11:00:02 +01:00
parent d4e93ee9b4 87f9258834
commit 4d17b2e9e8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/onepoll.php
View File

@ -176,7 +176,7 @@ function onepoll_run(&$argv, &$argc){
return; return;
} }
if(! strstr($handshake_xml,'<?xml')) { if(! strstr($handshake_xml,'<')) {
logger('poller: response from ' . $url . ' did not contain XML.'); logger('poller: response from ' . $url . ' did not contain XML.');
mark_for_death($contact); mark_for_death($contact);
@ -537,7 +537,7 @@ function onepoll_run(&$argv, &$argc){
if($xml) { if($xml) {
logger('poller: received xml : ' . $xml, LOGGER_DATA); logger('poller: received xml : ' . $xml, LOGGER_DATA);
if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) { if(! strstr($xml,'<')) {
logger('poller: post_handshake: response from ' . $url . ' did not contain XML.'); logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),