nets widget - allow all children of specified parent net regardless of network

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 424f2997ef1610e4bd17ef46e8ec42f3ba05f73b..caa0572d20f79aff5a3bf2deb669364836ac10cb 100644 (file)
--- 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 9318d20ca01fc9bacfdeb47c0027b8438bd0dc51..159da7f51f8b00d389e57798617ff7453160c91d 100644 (file)
--- 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)
                        );