clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3967 from annando/forum-group 

Network page: Selecting a forum overrides the group selection
This commit is contained in:
Tobias Diekershoff 2017-11-26 17:19:31 +01:00 committed by GitHub
parent 3fbf2e3bcf 661f9af93a
commit b1b4359fae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/network.php
View File

@ -39,12 +39,17 @@ function network_init(App $a) {
} }
$is_a_date_query = false; $is_a_date_query = false;
$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
if (x($_GET, 'cid') && intval($_GET['cid']) != 0) { if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
$cid = $_GET['cid']; $cid = $_GET['cid'];
$_GET['nets'] = 'all'; $_GET['nets'] = 'all';
$group_id = 0;
} }
PConfig::set(local_user(), 'network.view', 'group.selected', $group_id);
if ($a->argc > 1) { if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) { for ($x = 1; $x < $a->argc; $x ++) {
if (is_a_date_arg($a->argv[$x])) { if (is_a_date_arg($a->argv[$x])) {
@ -145,9 +150,6 @@ function network_init(App $a) {
unset($_GET['nets']); unset($_GET['nets']);
} }
$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
PConfig::set(local_user(), 'network.view', 'group.selected', $group_id);
if (!x($a->page, 'aside')) { if (!x($a->page, 'aside')) {
$a->page['aside'] = ''; $a->page['aside'] = '';