diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-28 09:27:59 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-28 09:27:59 +0200 |
| commit | dccd2da3563389a37ccddbb166bbb3b5ed3a0124 (patch) | |
| tree | 31b646818c906339f01bd4538aee7364f5ef8c9d /mod/acl.php | |
| parent | e986fc3e301f2a0cfb3b975fe60974fc5dcfd76b (diff) | |
| parent | 44d7c6aac3548e94e35aed87ba7c06b04f374fc2 (diff) | |
| download | volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.tar.gz volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.tar.bz2 volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.zip | |
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'mod/acl.php')
| -rw-r--r-- | mod/acl.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/acl.php b/mod/acl.php index cb5959a95..f2d2456a6 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -53,12 +53,13 @@ function acl_init(&$a){ "photo" => "images/default-group-mm.png", "name" => $g['name'], "id" => intval($g['id']), - "uids" => array_map("intval", explode(",",$g['uids'])) + "uids" => array_map("intval", explode(",",$g['uids'])), + "link" => '' ); } - $r = q("SELECT `id`, `name`, `micro`, `network` FROM `contact` + $r = q("SELECT `id`, `name`, `micro`, `network`, `url` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' $sql_extra ORDER BY `name` ASC ", @@ -70,7 +71,8 @@ function acl_init(&$a){ "photo" => $g['micro'], "name" => $g['name'], "id" => intval($g['id']), - "network" => $g['network'] + "network" => $g['network'], + "link" => $g['url'], ); } |