Merge pull request #9963 from mexon/mat/support-cid-scheme

[friendica.git] / src / Module / Conversation / Network.php

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index be87da5f68c19446cd711f6dad2d54cbf43dd47d..c093cc9ca6a0d0891f3f250c6ff5ddb2238b0e2c 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -306,12 +306,21 @@ class Network extends BaseModule
                if (!empty($get['order'])) {
                        self::$selectedTab = $get['order'];
                        self::$order = $get['order'];
+                       self::$star = false;
+                       self::$mention = false;
                } elseif (in_array(self::$selectedTab, ['received', 'star', 'mention'])) {
                        self::$order = 'received';
                }
 
                self::$selectedTab = self::$selectedTab ?? self::$order;
 
+               // Prohibit combined usage of "star" and "mention"
+               if (self::$selectedTab == 'star') {
+                       self::$mention = false;
+               } elseif (self::$selectedTab == 'mention') {
+                       self::$star = false;
+               }
+
                Session::set('network-tab', self::$selectedTab);
                DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab);