mirror of
https://github.com/friendica/friendica
synced 2025-04-26 03:50:12 +00:00
Issue 13844: User defined channels based on the network
This commit is contained in:
parent
672186e549
commit
7924085c94
10 changed files with 188 additions and 110 deletions
|
@ -39,7 +39,7 @@ class Channel extends ChannelModule
|
|||
$o = '';
|
||||
if ($this->update || $this->force) {
|
||||
if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
|
||||
$items = $this->getChannelItems();
|
||||
$items = $this->getChannelItems($request);
|
||||
} else {
|
||||
$items = $this->getCommunityItems();
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ class Network extends NetworkModule
|
|||
}
|
||||
|
||||
if ($this->channel->isTimeline($this->selectedTab) || $this->userDefinedChannel->isTimeline($this->selectedTab, $this->session->getLocalUserId())) {
|
||||
$items = $this->getChannelItems();
|
||||
$items = $this->getChannelItems($request);
|
||||
} elseif ($this->community->isTimeline($this->selectedTab)) {
|
||||
$items = $this->getCommunityItems();
|
||||
} else {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue