Issue 9457: Fix network order for starred and mention

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index b19f409025d33f63db4ad070d262add7444ff981..886ce25931717e689097e5d6cca50adf8bfc6a33 100644 (file)
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -285,21 +285,25 @@ class Network extends BaseModule
 
                self::$selectedTab = Session::get('network-tab', DI::pConfig()->get(local_user(), 'network.view', 'selected_tab', ''));
 
+               self::$order = 'commented';
+
                if (!empty($get['star'])) {
                        self::$selectedTab = 'star';
+                       self::$order = 'received';
                }
 
                if (!empty($get['mention'])) {
                        self::$selectedTab = 'mention';
+                       self::$order = 'received';
                }
 
                if (!empty($get['order'])) {
                        self::$selectedTab = $get['order'];
+                       self::$order = $get['order'];
                }
 
                self::$star    = intval($get['star'] ?? 0);
                self::$mention = intval($get['mention'] ?? 0);
-               self::$order   = $get['order'] ?? Session::get('network-order', 'commented');
 
                self::$selectedTab = self::$selectedTab ?? self::$order;
 
@@ -339,8 +343,6 @@ class Network extends BaseModule
                                self::$order = 'commented';
                                self::$max_id = $get['last_commented'] ?? self::$max_id;
                }
-
-               Session::set('network-order', self::$order);
        }
 
        protected static function getItems(string $table, array $params, array $conditionFields = [])