Merge remote-tracking branch 'upstream/develop' into post-thread-user

This commit is contained in:
Michael 2021-02-01 19:31:39 +00:00
commit be3dfb4ffe
25 changed files with 20276 additions and 18222 deletions

View file

@ -894,7 +894,7 @@ function item_photo_menu($item) {
$ignore_link = '';
if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) {
$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
$sub_link = 'javascript:doFollowThread(' . $item['id'] . '); return false;';
}
$author = ['uid' => 0, 'id' => $item['author-id'],