nets widget - allow all children of specified parent net regardless of network
This commit is contained in:
parent
c3ada095f4
commit
cfe8094b45
|
@ -61,6 +61,9 @@ function networks_widget($baseurl,$selected = '') {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(count($nets) < 2)
|
||||||
|
return '';
|
||||||
|
|
||||||
return replace_macros(get_markup_template('nets.tpl'),array(
|
return replace_macros(get_markup_template('nets.tpl'),array(
|
||||||
'$title' => t('Networks'),
|
'$title' => t('Networks'),
|
||||||
'$desc' => '',
|
'$desc' => '',
|
||||||
|
|
|
@ -466,7 +466,7 @@ function network_content(&$a, $update = 0) {
|
||||||
AND `contact`.`id` = `item`.`contact-id`
|
AND `contact`.`id` = `item`.`contact-id`
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
AND `item`.`parent` IN ( %s )
|
AND `item`.`parent` IN ( %s )
|
||||||
$sql_extra $sql_nets",
|
$sql_extra ",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
dbesc($parents_str)
|
dbesc($parents_str)
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue