bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #9475 from annando/network-order

Browse source 
Fix order on network page
This commit is contained in:
Hypolite Petovan 2020-10-30 18:33:00 -04:00 committed by GitHub
commit e5c145e73c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Conversation/Network.php
View file

@ -289,17 +289,17 @@ class Network extends BaseModule
if (!empty($get['star'])) { if (!empty($get['star'])) {
self::$selectedTab = 'star'; self::$selectedTab = 'star';
self::$order = 'received';
} }
if (!empty($get['mention'])) { if (!empty($get['mention'])) {
self::$selectedTab = 'mention'; self::$selectedTab = 'mention';
self::$order = 'received';
} }
if (!empty($get['order'])) { if (!empty($get['order'])) {
self::$selectedTab = $get['order']; self::$selectedTab = $get['order'];
self::$order = $get['order']; self::$order = $get['order'];
} elseif (in_array(self::$selectedTab, ['received', 'star', 'mention'])) {
self::$order = 'received';
} }
self::$star = intval($get['star'] ?? 0); self::$star = intval($get['star'] ?? 0);