diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-02-04 10:03:38 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-02-04 10:03:38 +0100 |
| commit | cf80f03084a2bdb0764f25a55c7b6707d2b3ef81 (patch) | |
| tree | 5e07935656f5e17258a773e41da4aa206648dfb5 /Zotlabs/Lib | |
| parent | d97043725d3a38da9686dbf9501272d175e5420a (diff) | |
| parent | 47f31eed37b8cc94805d01b2ab661d69cc24fa38 (diff) | |
| download | volse-hubzilla-cf80f03084a2bdb0764f25a55c7b6707d2b3ef81.tar.gz volse-hubzilla-cf80f03084a2bdb0764f25a55c7b6707d2b3ef81.tar.bz2 volse-hubzilla-cf80f03084a2bdb0764f25a55c7b6707d2b3ef81.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 8cfa18997..259419f54 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1411,6 +1411,9 @@ class Activity { $s['owner_xchan'] = $act->actor['id']; $s['author_xchan'] = $act->actor['id']; + // ensure we store the original actor + self::actor_store($act->actor['id'],$act->actor); + $s['mid'] = $act->obj['id']; $s['parent_mid'] = $act->parent_id; @@ -1483,7 +1486,8 @@ class Activity { $s['verb'] = self::activity_decode_mapper($act->type); - if($act->type === 'Tombstone') { + + if($act->type === 'Tombstone' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) { $s['item_deleted'] = 1; } @@ -1492,7 +1496,6 @@ class Activity { $s['obj_type'] = ACTIVITY_OBJ_COMMENT; } - if($act->obj['type'] === 'Event') { $s['obj'] = []; $s['obj']['asld'] = $act->obj; |