From db8be13bbfe53d4ab3e0f8747d9240da3c17be38 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 30 Oct 2020 22:13:14 +0000
Subject: [PATCH] Fix order on network page

---
 src/Module/Conversation/Network.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 886ce2593..8fe3dca92 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -289,17 +289,17 @@ class Network extends BaseModule
 
 		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'];
+		} elseif (in_array(self::$selectedTab, ['received', 'star', 'mention'])) {
+			self::$order = 'received';
 		}
 
 		self::$star    = intval($get['star'] ?? 0);