Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9452 from annando/issue-9451

Browse source 
Issue 9451: We now do store the tab in a config again
This commit is contained in:
Hypolite Petovan 2020-10-24 13:06:38 -04:00 committed by GitHub
commit 490c151e73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -283,7 +283,7 @@ class Network extends BaseModule
self::$forumContactId = $parameters['contact_id'] ?? 0; self::$forumContactId = $parameters['contact_id'] ?? 0;
self::$selectedTab = Session::get('network-tab', ''); self::$selectedTab = Session::get('network-tab', DI::pConfig()->get(local_user(), 'network.view', 'selected_tab', ''));
if (!empty($get['star'])) { if (!empty($get['star'])) {
self::$selectedTab = 'star'; self::$selectedTab = 'star';
@ -297,8 +297,6 @@ 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'] ?? Session::get('network-order', 'commented'); self::$order = $get['order'] ?? Session::get('network-order', 'commented');
@ -306,7 +304,7 @@ class Network extends BaseModule
self::$selectedTab = self::$selectedTab ?? self::$order; self::$selectedTab = self::$selectedTab ?? self::$order;
Session::set('network-tab', self::$selectedTab); Session::set('network-tab', self::$selectedTab);
Session::set('network-order', self::$order); DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab);
self::$accountTypeString = $get['accounttype'] ?? $parameters['accounttype'] ?? ''; self::$accountTypeString = $get['accounttype'] ?? $parameters['accounttype'] ?? '';
self::$accountType = User::getAccountTypeByString(self::$accountTypeString); self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
@ -331,16 +329,18 @@ class Network extends BaseModule
case 'received': case 'received':
self::$max_id = $get['last_received'] ?? self::$max_id; self::$max_id = $get['last_received'] ?? self::$max_id;
break; break;
case 'commented':
self::$max_id = $get['last_commented'] ?? self::$max_id;
break;
case 'created': case 'created':
self::$max_id = $get['last_created'] ?? self::$max_id; self::$max_id = $get['last_created'] ?? self::$max_id;
break; break;
case 'uriid': case 'uriid':
self::$max_id = $get['last_uriid'] ?? self::$max_id; self::$max_id = $get['last_uriid'] ?? self::$max_id;
break; break;
default:
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 = []) protected static function getItems(string $table, array $params, array $conditionFields = [])