From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sun, 19 Nov 2017 23:09:14 +0000 (-0500)
Subject: Merge branch 'develop' into issue/3878-move-Contact-to-src
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b85c94a60d5142adc9aa77d2de7c05b91021c450;p=friendica.git

Merge branch 'develop' into issue/3878-move-Contact-to-src
---

b85c94a60d5142adc9aa77d2de7c05b91021c450
diff --cc src/Worker/OnePoll.php
index 122b400bb8,374c69f13f..356fce4337
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@@ -206,9 -206,9 +206,9 @@@ Class OnePol
  			}
  
  			if (!strstr($handshake_xml, '<')) {
- 				logger('poller: response from ' . $url . ' did not contain XML.');
+ 				logger('response from ' . $url . ' did not contain XML.');
  
 -				mark_for_death($contact);
 +				Contact::markForArchival($contact);
  
  				$fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
  				dba::update('contact', $fields, array('id' => $contact['id']));
@@@ -227,10 -227,10 +227,10 @@@
  				$fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
  				dba::update('contact', $fields, array('id' => $contact['id']));
  
 -				mark_for_death($contact);
 +				Contact::markForArchival($contact);
  			} elseif ($contact['term-date'] > NULL_DATE) {
- 				logger("poller: $url back from the dead - removing mark for death");
+ 				logger("$url back from the dead - removing mark for death");
 -				unmark_for_death($contact);
 +				Contact::unmarkForArchival($contact);
  			}
  
  			if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {