Merge pull request #351 from annando/master

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 05134ef8f5e35f68d85cc01129e2bcb881cae143..a0dd1c8159fc0a61130d7079541cba5c27960ca0 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -446,6 +446,8 @@ function get_atom_elements($feed,$item) {
                $res['body'] = $purifier->purify($res['body']);
 
                $res['body'] = @html2bbcode($res['body']);
+
+
        }
        elseif(! $have_real_body) {
 
@@ -1264,6 +1266,12 @@ 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");
+               require_once('include/Contact.php');
+               unmark_for_death($contact);
+       }
+
        $res = parse_xml_string($xml);
 
        return $res->status;