Merge pull request #5780 from annando/fix-relocation

[friendica.git] / src / Worker / Delivery.php

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e0a5c09c270d48ec72a8379d880a44c6d82c8fcf..3a93d92f7b37366047dfc551e4c792081c9fb65e 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -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);