diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index 89d1f26e7b..c093cc9ca6 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -314,6 +314,13 @@ class Network extends BaseModule 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);