From 661f9af93ad92cb2c3e5a267f808c13661868495 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 26 Nov 2017 16:17:32 +0000
Subject: [PATCH] Network page: Selecting a forum overrides the group selection
---
mod/network.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/mod/network.php b/mod/network.php
index f58fad6fd..64863b080 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -39,12 +39,17 @@ function network_init(App $a) {
}
$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) {
$cid = $_GET['cid'];
$_GET['nets'] = 'all';
-
+ $group_id = 0;
}
+ PConfig::set(local_user(), 'network.view', 'group.selected', $group_id);
+
if ($a->argc > 1) {
for ($x = 1; $x < $a->argc; $x ++) {
if (is_a_date_arg($a->argv[$x])) {
@@ -145,9 +150,6 @@ function network_init(App $a) {
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')) {
$a->page['aside'] = '';