diff options
| author | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-21 13:38:14 +0300 |
|---|---|---|
| committer | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-21 13:38:14 +0300 |
| commit | 5e3e3915e347e4c298498ce0a8c493b9cd03201b (patch) | |
| tree | 5a7aabb78964ab82caebac84299015af4f87882d /include/items.php | |
| parent | d20cdf09eafbc57c1b6dbcb78a5cdaa731ae876d (diff) | |
| parent | 53c9ea760659b39deeab9cff5d4f26d5abd63d31 (diff) | |
| download | volse-hubzilla-5e3e3915e347e4c298498ce0a8c493b9cd03201b.tar.gz volse-hubzilla-5e3e3915e347e4c298498ce0a8c493b9cd03201b.tar.bz2 volse-hubzilla-5e3e3915e347e4c298498ce0a8c493b9cd03201b.zip | |
Merge git://github.com/friendica/friendica
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 05134ef8f..a0dd1c815 100755 --- 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; |