diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-01-28 12:48:21 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-01-28 12:48:21 +0100 |
| commit | 671b6d2edaa344ef4d41743322e8090265bf8f9a (patch) | |
| tree | ed09bcdc1e828efd6c6fea08e063dc4ad1fc42bb /Zotlabs | |
| parent | e3d39fbf3fe99c6ce9de256290e83c49fea8808b (diff) | |
| parent | 94cbc8bd3160bf644b02ef97268244869b7a9f5b (diff) | |
| download | volse-hubzilla-671b6d2edaa344ef4d41743322e8090265bf8f9a.tar.gz volse-hubzilla-671b6d2edaa344ef4d41743322e8090265bf8f9a.tar.bz2 volse-hubzilla-671b6d2edaa344ef4d41743322e8090265bf8f9a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Lib/Share.php | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 03f094983..8cfa18997 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -411,6 +411,11 @@ class Activity { $ret['type'] = 'Tombstone'; $ret['formerType'] = self::activity_obj_mapper($i['obj_type']); $ret['id'] = ((strpos($i['mid'],'http') === 0) ? $i['mid'] : z_root() . '/item/' . urlencode($i['mid'])); + $actor = self::encode_person($i['author'],false); + if($actor) + $ret['actor'] = $actor; + else + return []; return $ret; } diff --git a/Zotlabs/Lib/Share.php b/Zotlabs/Lib/Share.php index d3ecbf7fa..3a2ab1783 100644 --- a/Zotlabs/Lib/Share.php +++ b/Zotlabs/Lib/Share.php @@ -54,6 +54,7 @@ class Share { if(! $this->item) return $obj; + $obj['asld'] = $this->item['mid']; $obj['type'] = $this->item['obj_type']; $obj['id'] = $this->item['mid']; $obj['content'] = $this->item['body']; |