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

Store the selected network tab in a session variable

Browse source
This commit is contained in:
Michael 2020-10-17 18:52:05 +00:00
parent a24ae975a9
commit 14274bc204
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\ACL; use Friendica\Core\ACL;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
@ -282,7 +283,7 @@ class Network extends BaseModule
self::$forumContactId = $parameters['contact_id'] ?? 0; self::$forumContactId = $parameters['contact_id'] ?? 0;
self::$selectedTab = ''; self::$selectedTab = Session::get('network-tab', '');
if (!empty($get['star'])) { if (!empty($get['star'])) {
self::$selectedTab = 'star'; self::$selectedTab = 'star';
@ -296,9 +297,16 @@ class Network extends BaseModule
self::$selectedTab = $get['order']; self::$selectedTab = $get['order'];
} }
Session::set('network-tab', self::$selectedTab);
self::$star = intval($get['star'] ?? 0); self::$star = intval($get['star'] ?? 0);
self::$mention = intval($_GET['mention'] ?? 0); self::$mention = intval($_GET['mention'] ?? 0);
self::$order = $get['order'] ?? 'commented'; self::$order = $get['order'] ?? Session::get('network-order', 'commented');
self::$selectedTab = self::$selectedTab ?? self::$order;
Session::set('network-tab', self::$selectedTab);
Session::set('network-order', self::$order);
self::$accountTypeString = $_GET['accounttype'] ?? $parameters['accounttype'] ?? ''; self::$accountTypeString = $_GET['accounttype'] ?? $parameters['accounttype'] ?? '';
self::$accountType = User::getAccountTypeByString(self::$accountTypeString); self::$accountType = User::getAccountTypeByString(self::$accountTypeString);