aboutsummaryrefslogtreecommitdiffstats
path: root/include/acl_selectors.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-19 16:55:33 +0200
committerMichael <icarus@dabo.de>2012-05-19 16:55:33 +0200
commit6342b3e0bdd5774857a8fca809994f05e0208d25 (patch)
tree54114a005e74c8a6d8bad8a490e1d1e41bc4178f /include/acl_selectors.php
parent2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (diff)
parent9a940786c18c1c2bd772aec93f1828f67dc45667 (diff)
downloadvolse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.gz
volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.bz2
volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'include/acl_selectors.php')
-rw-r--r--include/acl_selectors.php4
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())