Merge branch 'dev' into 'dev'

Add AS threaded comments support

See merge request hubzilla/core!1618
This commit is contained in:
Max Kostikov 2019-05-01 21:45:12 +02:00
commit cbe35281b9

View File

@ -310,7 +310,7 @@ class Activity {
$ret['attributedTo'] = $i['author']['xchan_url']; $ret['attributedTo'] = $i['author']['xchan_url'];
if($i['id'] != $i['parent']) { if($i['id'] != $i['parent']) {
$ret['inReplyTo'] = ((strpos($i['parent_mid'],'http') === 0) ? $i['parent_mid'] : z_root() . '/item/' . urlencode($i['parent_mid'])); $ret['inReplyTo'] = ((strpos($i['thr_parent'],'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
} }
if($i['mimetype'] === 'text/bbcode') { if($i['mimetype'] === 'text/bbcode') {
@ -509,7 +509,7 @@ class Activity {
} }
if($i['id'] != $i['parent']) { if($i['id'] != $i['parent']) {
$ret['inReplyTo'] = ((strpos($i['parent_mid'],'http') === 0) ? $i['parent_mid'] : z_root() . '/item/' . urlencode($i['parent_mid'])); $ret['inReplyTo'] = ((strpos($i['thr_parent'],'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
$reply = true; $reply = true;
if($i['item_private']) { if($i['item_private']) {