From 70b3c8080ecb3bafea7dd57ec07a410061b26953 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Fri, 24 Mar 2023 09:01:06 +0000
Subject: encode object after we have dealt with deleted items and work around
 a php error

---
 Zotlabs/Lib/Activity.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Zotlabs/Lib/Activity.php')

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index d4a89d2a4..baa27a051 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -419,10 +419,6 @@ class Activity {
 			$objtype = self::activity_obj_mapper($i['obj_type']);
 		}
 
-		if (isset($i['obj']) && $i['obj']) {
-			$ret = Activity::encode_object($i['obj']);
-		}
-
 		if (intval($i['item_deleted'])) {
 			$ret['type']       = 'Tombstone';
 			$ret['formerType'] = $objtype;
@@ -434,6 +430,10 @@ class Activity {
 			return $ret;
 		}
 
+		if (isset($i['obj']) && $i['obj']) {
+			$ret = Activity::encode_object($i['obj']);
+		}
+
 		if (isset($i['obj']) && $i['obj']) {
 			if (is_array($i['obj'])) {
 				$ret = $i['obj'];
-- 
cgit v1.2.3