diff options
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']; } |