diff options
author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-05 20:48:16 +0530 |
---|---|---|
committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-05 20:48:16 +0530 |
commit | b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80 (patch) | |
tree | 74234775d723e33378059f2fa45fa80e3bc6ac43 /include/acl_selectors.php | |
parent | 214ec91a3f2c5fec6cced93f669b3a9725f0e40a (diff) | |
parent | 8ae83201cf8f3c943972a8f246b7972aa640afb4 (diff) | |
download | volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.gz volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.bz2 volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'include/acl_selectors.php')
-rw-r--r-- | include/acl_selectors.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php index a5f5aff53..461ad0c36 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -122,7 +122,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) { $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n"; $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != '' $sql_extra ORDER BY `name` ASC ", intval(local_user()) @@ -188,7 +188,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" $tabindex >\r\n"; $r = q("SELECT `id`, `name`, `url`, `network` FROM `contact` - WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' + WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 AND `notify` != '' $sql_extra ORDER BY `name` ASC ", intval(local_user()) |