aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-13 15:41:13 -0700
committerfriendica <info@friendica.com>2012-03-13 15:41:13 -0700
commit427362c324e5acfad18c72108a59a9e6e5b58550 (patch)
tree7046e107ea723a917959606bfc4c41d2c8ccd2b7 /mod/network.php
parentdc84da520d7bde3f2e160d2573a549829fd022cf (diff)
parentacc4bbeb6ebc832da2a8b5a37b764a6a53dd1214 (diff)
downloadvolse-hubzilla-427362c324e5acfad18c72108a59a9e6e5b58550.tar.gz
volse-hubzilla-427362c324e5acfad18c72108a59a9e6e5b58550.tar.bz2
volse-hubzilla-427362c324e5acfad18c72108a59a9e6e5b58550.zip
Merge branch 'pull'
Diffstat (limited to 'mod/network.php')
-rwxr-xr-xmod/network.php14
1 files changed, 8 insertions, 6 deletions
diff --git a/mod/network.php b/mod/network.php
index 861b5ab73..7e7a95841 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -44,7 +44,7 @@ function network_init(&$a) {
}
$a->page['aside'] .= group_side('network','network',true,$group_id);
- $a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(($_GET['nets']) ? $_GET['nets'] : ''));
+ $a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
$a->page['aside'] .= saved_searches($search);
}
@@ -132,15 +132,15 @@ function network_content(&$a, $update = 0) {
$starred_active = 'active';
}
- if($_GET['bmark']) {
+ if(x($_GET,'bmark')) {
$bookmarked_active = 'active';
}
- if($_GET['conv']) {
+ if(x($_GET,'conv')) {
$conv_active = 'active';
}
- if($_GET['spam']) {
+ if(x($_GET,'spam')) {
$spam_active = 'active';
}
@@ -248,7 +248,7 @@ function network_content(&$a, $update = 0) {
$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
if(! $update) {
- if(group) {
+ if($group) {
if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
'Warning: This group contains %s members from an insecure network.',
@@ -498,7 +498,9 @@ function network_content(&$a, $update = 0) {
$items = conv_sort($items,$ordering);
- }
+ } else {
+ $items = array();
+ }
}