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

Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

Browse source
This commit is contained in:
Michael 2018-09-22 15:18:53 +00:00
commit c083ae047c
69 changed files with 16128 additions and 16187 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Worker/Delivery.php
View file

@ -292,8 +292,10 @@ class Delivery extends BaseObject
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
} else {
} elseif ($cmd != self::RELOCATION) {
$deliver_status = DFRN::deliver($owner, $contact, $atom);
} else {
$deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
}
logger('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);