mirror of
https://github.com/friendica/friendica
synced 2025-04-27 11:50:11 +00:00
Network, Channels and Community are children of timeline
This commit is contained in:
parent
41919bdaea
commit
013aee01f5
14 changed files with 875 additions and 762 deletions
|
@ -38,7 +38,13 @@ class Channel extends ChannelModule
|
|||
|
||||
$o = '';
|
||||
if (!empty($request['force'])) {
|
||||
$o = $this->conversation->render($this->getItems($request), Conversation::MODE_CHANNEL, true, false, 'created', $this->session->getLocalUserId());
|
||||
if ($this->timeline->isChannel(self::$selectedTab)) {
|
||||
$items = $this->getChannelItems();
|
||||
} else {
|
||||
$items = $this->getCommunityItems();
|
||||
}
|
||||
|
||||
$o = $this->conversation->render($items, Conversation::MODE_CHANNEL, true, false, 'created', $this->session->getLocalUserId());
|
||||
}
|
||||
|
||||
System::htmlUpdateExit($o);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue