Issue 9457: Fix remembering "personal" and "starred"

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 2c1bb2d8e4d59cb6dddf93bd6548456fb5770fe0..06d8136d1a3028752163fad196214f93a4e1376b 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -289,10 +289,16 @@ class Network extends BaseModule
 
                if (!empty($get['star'])) {
                        self::$selectedTab = 'star';
+                       self::$star = true;
+               } else {
+                       self::$star = self::$selectedTab == 'star';
                }
 
                if (!empty($get['mention'])) {
                        self::$selectedTab = 'mention';
+                       self::$mention = true;
+               } else {
+                       self::$mention = self::$selectedTab == 'mention';
                }
 
                if (!empty($get['order'])) {
@@ -302,9 +308,6 @@ class Network extends BaseModule
                        self::$order = 'received';
                }
 
-               self::$star    = intval($get['star'] ?? 0);
-               self::$mention = intval($get['mention'] ?? 0);
-
                self::$selectedTab = self::$selectedTab ?? self::$order;
 
                Session::set('network-tab', self::$selectedTab);