Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 03:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix and improvements for unmarking potentially archived contacts

Browse source
This commit is contained in:
Michael 2018-02-14 21:18:16 +00:00
parent cdc8a3b68d
commit 43b1eccbcd
3 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Protocol/DFRN.php
View file

@ -1353,11 +1353,6 @@ class DFRN
return 3;
}
if ($contact['term-date'] > NULL_DATE) {
logger("dfrn_deliver: $url back from the dead - removing mark for death");
Contact::unmarkForArchival($contact);
}
$res = XML::parseString($xml);
if (!isset($res->status)) {
@ -1368,6 +1363,10 @@ class DFRN
logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
}
if ($res->status == 200) {
Contact::unmarkForArchival($contact);
}
return intval($res->status);
}