bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9679 from annando/issue-9457

Browse source 
Issue 9457: Fix remembering "personal" and "starred"
This commit is contained in:
Hypolite Petovan 2020-12-19 13:06:11 -05:00 committed by GitHub
parent cb88be3883 944b0eadb7
commit 12e1be30aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -289,10 +289,16 @@ class Network extends BaseModule
if (!empty($get['star'])) { if (!empty($get['star'])) {
self::$selectedTab = 'star'; self::$selectedTab = 'star';
self::$star = true;
} else {
self::$star = self::$selectedTab == 'star';
} }
if (!empty($get['mention'])) { if (!empty($get['mention'])) {
self::$selectedTab = 'mention'; self::$selectedTab = 'mention';
self::$mention = true;
} else {
self::$mention = self::$selectedTab == 'mention';
} }
if (!empty($get['order'])) { if (!empty($get['order'])) {
@ -302,9 +308,6 @@ class Network extends BaseModule
self::$order = 'received'; self::$order = 'received';
} }
self::$star = intval($get['star'] ?? 0);
self::$mention = intval($get['mention'] ?? 0);
self::$selectedTab = self::$selectedTab ?? self::$order; self::$selectedTab = self::$selectedTab ?? self::$order;
Session::set('network-tab', self::$selectedTab); Session::set('network-tab', self::$selectedTab);