From 0dbb6313a57ba6ec9e22876f3165dabd037fcdf0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 22 Sep 2018 06:47:35 +0000
Subject: [PATCH] Hopefully fixes relocations that hadn't been executed

---
 src/Protocol/DFRN.php   | 4 ++--
 src/Worker/Delivery.php | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index b207c3ca87..1ab4d8f9e4 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1164,12 +1164,12 @@ class DFRN
 	 * @return int Deliver status. Negative values mean an error.
 	 * @todo Add array type-hint for $owner, $contact
 	 */
-	public static function deliver($owner, $contact, $atom, $dissolve = false)
+	public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false)
 	{
 		$a = get_app();
 
 		// At first try the Diaspora transport layer
-		if (!$dissolve) {
+		if (!$dissolve && !$legacy_transport) {
 			$ret = self::transmit($owner, $contact, $atom);
 			if ($ret >= 200) {
 				logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e0a5c09c27..3a93d92f7b 100644
--- 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);