diff options
| author | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
|---|---|---|
| committer | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
| commit | 273594af62c960b5a52da5ec1cf6d6bd450415ba (patch) | |
| tree | 5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /mod/acl.php | |
| parent | 1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff) | |
| parent | dfd5cc57c2134067dc6229b8583b5e808f160004 (diff) | |
| download | volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2 volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip | |
Merge remote branch 'upstream/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'], ); } |