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

diff --git a/include/items.php b/include/items.php
index 05134ef8f5e35f68d85cc01129e2bcb881cae143..73812978a92c7ca65caa6f04a8e00b2c380d112d 100755 (executable)
--- 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;