aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-06 00:23:05 -0800
committerfriendica <info@friendica.com>2012-01-06 00:23:05 -0800
commitcfe8094b458c62cbab0b79dd957c31dbf60a26c4 (patch)
tree98b5e3a097e3c077c0e9eac1ae360c141f6c1add
parentc3ada095f4156bba01e77d2d250d5821ba5e859e (diff)
downloadvolse-hubzilla-cfe8094b458c62cbab0b79dd957c31dbf60a26c4.tar.gz
volse-hubzilla-cfe8094b458c62cbab0b79dd957c31dbf60a26c4.tar.bz2
volse-hubzilla-cfe8094b458c62cbab0b79dd957c31dbf60a26c4.zip
nets widget - allow all children of specified parent net regardless of network
-rw-r--r--include/contact_widgets.php3
-rw-r--r--mod/network.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 424f2997e..caa0572d2 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -61,6 +61,9 @@ function networks_widget($baseurl,$selected = '') {
}
}
+ if(count($nets) < 2)
+ return '';
+
return replace_macros(get_markup_template('nets.tpl'),array(
'$title' => t('Networks'),
'$desc' => '',
diff --git a/mod/network.php b/mod/network.php
index 9318d20ca..159da7f51 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -466,7 +466,7 @@ function network_content(&$a, $update = 0) {
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`parent` IN ( %s )
- $sql_extra $sql_nets",
+ $sql_extra ",
intval(local_user()),
dbesc($parents_str)
);