diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-18 16:58:20 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-18 16:58:20 +0200 |
| commit | ee1641393550eea9200f792707070e024879d466 (patch) | |
| tree | ee9e19d380cdf4fee74d4b7c1fa323098c72b93b /include/acl_selectors.php | |
| parent | 62dbfffe399333cd4a792cc77256a2bcd689a14f (diff) | |
| parent | 741a262f1b2d5c8f911896da32e80d543afb5cd1 (diff) | |
| download | volse-hubzilla-ee1641393550eea9200f792707070e024879d466.tar.gz volse-hubzilla-ee1641393550eea9200f792707070e024879d466.tar.bz2 volse-hubzilla-ee1641393550eea9200f792707070e024879d466.zip | |
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to 'include/acl_selectors.php')
| -rw-r--r-- | include/acl_selectors.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index fa700818f..d1303d933 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -57,9 +57,12 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD)); } - if($privmail || $privatenet) { + if($privmail) { $sql_extra .= " AND `network` IN ( 'dfrn' ) "; - } + } + elseif($privatenet) { + $sql_extra .= " AND `network` IN ( 'dfrn', 'mail' ) "; + } if($privmail) $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n"; |