mirror
/
friendica
kopia lustrzana https://github.com/friendica/friendica
1
0
Forkuj 1
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Issue 9451: We now do store the tab in a config again

pull/9452/head
Michael 2020-10-24 13:11:44 +00:00
rodzic c154efb028
commit adb660f1ad
1 zmienionych plików z 7 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
src/Module/Conversation/Network.php
Wyświetl plik

@ -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);
@ -340,7 +338,12 @@ class Network extends BaseModule
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 = [])