From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 2 Dec 2018 15:24:50 +0000 (-0500)
Subject: Merge branch 'develop' into bug/6211-fix-contact-nets-all
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=924869ab5b75fd496014a1b7ca1240a6df939fc6;p=friendica.git

Merge branch 'develop' into bug/6211-fix-contact-nets-all
---

924869ab5b75fd496014a1b7ca1240a6df939fc6
diff --cc mod/network.php
index e4e1dd3c53,52daa2eefe..46861e3943
--- a/mod/network.php
+++ b/mod/network.php
@@@ -63,9 -63,9 +63,9 @@@ function network_init(App $a
  	$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
  
  	$cid = 0;
- 	if (x($_GET, 'cid') && intval($_GET['cid']) != 0) {
+ 	if (!empty($_GET['cid'])) {
  		$cid = $_GET['cid'];
 -		$_GET['nets'] = 'all';
 +		$_GET['nets'] = '';
  		$group_id = 0;
  	}
  
@@@ -151,7 -151,12 +151,7 @@@
  		}
  	}
  
- 	if (!x($a->page, 'aside')) {
 -	// If nets is set to all, unset it
 -	if (!empty($_GET['nets']) && $_GET['nets'] === 'all') {
 -		unset($_GET['nets']);
 -	}
 -
+ 	if (empty($a->page['aside'])) {
  		$a->page['aside'] = '';
  	}
  
diff --cc src/Module/Contact.php
index 12575064b9,3cfe705400..d12f003c2e
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@@ -40,8 -40,11 +40,8 @@@ class Contact extends BaseModul
  		}
  
  		$nets = defaults($_GET, 'nets', '');
 -		if ($nets == 'all') {
 -			$nets = '';
 -		}
  
- 		if (!x($a->page, 'aside')) {
+ 		if (empty($a->page['aside'])) {
  			$a->page['aside'] = '';
  		}