Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
d074656f26
45 changed files with 3136 additions and 1780 deletions
|
@ -684,6 +684,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
continue;
|
||||
}
|
||||
|
||||
call_hooks('display_item', $arr);
|
||||
|
||||
$item['pagedrop'] = $page_dropping;
|
||||
|
||||
if($item['id'] == $item['parent']) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue