Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap

This commit is contained in:
zotlabs 2018-09-02 23:13:15 -07:00
commit b0b08ea9bd

View file

@ -384,7 +384,10 @@ class Activity {
}
$ret['type'] = self::activity_mapper($i['verb']);
$ret['id'] = ((strpos($i['mid'],'http') === 0) ? $i['mid'] : z_root() . '/activity/' . urlencode($i['mid']));
if(strpos($i['mid'],z_root() . '/item/') !== false) {
$ret['id'] = str_replace('/item/','/activity/',$ret['id']);
}
if($i['title']) {
$ret['name'] = $i['title'];