Merge remote-tracking branch 'upstream/develop' into fix-diaspora-signature
This commit is contained in:
commit
914b3a9e3e
|
@ -215,7 +215,6 @@ class Processor
|
||||||
$item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
|
$item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
|
||||||
$item['app'] = $activity['service'];
|
$item['app'] = $activity['service'];
|
||||||
$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
|
$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
|
||||||
$item['diaspora_signed_text'] = defaults($activity, 'diaspora:comment', '');
|
|
||||||
|
|
||||||
$item = self::constructAttachList($activity['attachments'], $item);
|
$item = self::constructAttachList($activity['attachments'], $item);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user