Use "received" as tab for circles or groups when currently in a channel

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index dcaeac8d2dee5514076ff0a2b0a00b85aa180a49..a0a635ad6a632c7ec15c4dbced1b445f1d67eb10 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -317,6 +317,10 @@ class Network extends Timeline
                        throw new HTTPException\BadRequestException($this->l10n->t('Network feed not available.'));
                }
 
+               if (($this->network || $this->circleId || $this->groupContactId) && ($this->timeline->isChannel($this->selectedTab) || $this->timeline->isCommunity($this->selectedTab))) {
+                       $this->selectedTab = TimelineEntity::RECEIVED;
+               }
+
                if (!empty($request['star'])) {
                        $this->selectedTab = TimelineEntity::STAR;
                        $this->star = true;