harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
Mario Vavti 2019-01-28 12:48:21 +01:00
commit 671b6d2eda
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Lib/Activity.php
View File

@ -411,6 +411,11 @@ class Activity {
$ret['type'] = 'Tombstone'; $ret['type'] = 'Tombstone';
$ret['formerType'] = self::activity_obj_mapper($i['obj_type']); $ret['formerType'] = self::activity_obj_mapper($i['obj_type']);
$ret['id'] = ((strpos($i['mid'],'http') === 0) ? $i['mid'] : z_root() . '/item/' . urlencode($i['mid'])); $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; return $ret;
} }

1
Zotlabs/Lib/Share.php
View File

@ -54,6 +54,7 @@ class Share {
if(! $this->item) if(! $this->item)
return $obj; return $obj;
$obj['asld'] = $this->item['mid'];
$obj['type'] = $this->item['obj_type']; $obj['type'] = $this->item['obj_type'];
$obj['id'] = $this->item['mid']; $obj['id'] = $this->item['mid'];
$obj['content'] = $this->item['body']; $obj['content'] = $this->item['body'];