allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed.

1 files changed, 5 insertions, 0 deletions

diff --git a/include/items.php b/include/items.php
index 05134ef8f..73812978a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1264,6 +1264,11 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		return 3;
 	}
 
+	if($contact['term-date'] != '0000-00-00 00:00:00') {
+		logger("dfrn_deliver: $url back from the dead - removing mark for death");
+		unmark_for_death($contact);
+	}
+
 	$res = parse_xml_string($xml);
 
 	return $res->status;