diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-29 14:58:37 +0100 |
| commit | b71a3af4570ccf349804b9ffa151fc1d35287d88 (patch) | |
| tree | 264c012a0c8ca28c4035666d35c547a829968a2a /mod/acl.php | |
| parent | f5b8654818e63a0583e58caecc8a13c2d83c12d5 (diff) | |
| parent | fb33b4f2bcd18e63d311e6dba3aaa2ea5efdec3b (diff) | |
| download | volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.gz volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.tar.bz2 volse-hubzilla-b71a3af4570ccf349804b9ffa151fc1d35287d88.zip | |
Merge remote-tracking branch 'friendica/master' into randomerror
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 ", |