diff options
| author | friendica <info@friendica.com> | 2012-02-26 14:49:56 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-26 14:49:56 -0800 |
| commit | 6ddd444afde33337235eab3aa9d6d1fe12bcb7a4 (patch) | |
| tree | 9a8ed6282b805732251d254cadef124c90c85727 /mod/acl.php | |
| parent | b79380f906731ed1aa4dfa540dcf297fe253c904 (diff) | |
| parent | 4b1de0f538e6d3f48e2a4d1e82522aced6b08129 (diff) | |
| download | volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.tar.gz volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.tar.bz2 volse-hubzilla-6ddd444afde33337235eab3aa9d6d1fe12bcb7a4.zip | |
Merge pull request #49 from CatoTH/master
Bugfix for del_config
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 ", |