diff options
| author | Mario <mario@mariovavti.com> | 2023-03-24 09:01:06 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-03-24 09:01:06 +0000 |
| commit | 70b3c8080ecb3bafea7dd57ec07a410061b26953 (patch) | |
| tree | db6d4f119409147a80f2e57b1b815d12b08bd46c /Zotlabs/Lib/Activity.php | |
| parent | 2c483c460a2d5c806b9e62097673ad237e6b154a (diff) | |
| download | volse-hubzilla-70b3c8080ecb3bafea7dd57ec07a410061b26953.tar.gz volse-hubzilla-70b3c8080ecb3bafea7dd57ec07a410061b26953.tar.bz2 volse-hubzilla-70b3c8080ecb3bafea7dd57ec07a410061b26953.zip | |
encode object after we have dealt with deleted items and work around a php error
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 |
1 files changed, 4 insertions, 4 deletions
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; @@ -435,6 +431,10 @@ class Activity { } 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']; } |