diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-01 11:49:22 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-01 11:49:22 +0100 |
| commit | dd9432903ddb3e12381881da44fb84afff832d52 (patch) | |
| tree | b499e77cd4faf8157c2e048fb8242bc2ca2720cc /mod/acl.php | |
| parent | e0c659b34b8992111bcc64d3f0eea75dfa193412 (diff) | |
| parent | bd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61 (diff) | |
| download | volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.tar.gz volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.tar.bz2 volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/acl.php')
| -rwxr-xr-x | mod/acl.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/acl.php b/mod/acl.php index 98ca90ded..375c618c8 100755 --- a/mod/acl.php +++ b/mod/acl.php @@ -16,6 +16,8 @@ function acl_init(&$a){ if ($search!=""){ $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'"; $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')"; + } else { + $sql_extra = $sql_extra2 = ""; } // count groups and contacts @@ -75,7 +77,7 @@ function acl_init(&$a){ if ($type=='' || $type=='c'){ - $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact` + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' $sql_extra2 ORDER BY `name` ASC ", |