diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-04-25 09:57:28 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-04-25 09:57:28 +0200 |
| commit | ed785fbb1b4776a5d1fce382a307d9180c5f650a (patch) | |
| tree | d99e436694048a2471824fa3ec27844e9a8c05c4 /Zotlabs/Module | |
| parent | 0a51ea1bfa85d770f5dd2c7fd1428b785c17e125 (diff) | |
| parent | 8face5a66c82e7086c379ca4b07f178a85a781b3 (diff) | |
| download | volse-hubzilla-ed785fbb1b4776a5d1fce382a307d9180c5f650a.tar.gz volse-hubzilla-ed785fbb1b4776a5d1fce382a307d9180c5f650a.tar.bz2 volse-hubzilla-ed785fbb1b4776a5d1fce382a307d9180c5f650a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 4c5883e88..35594ae9f 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -354,7 +354,7 @@ class Acl extends \Zotlabs\Web\Controller { "name" => $g['name'] . (($type === 'f') ? '' : '+'), "id" => urlencode($g['id']) . (($type === 'f') ? '' : '+'), "xid" => $g['hash'], - "link" => $g['nick'], + "link" => (($g['nick']) ? $g['nick'] : $g['url']), "nick" => substr($g['nick'],0,strpos($g['nick'],'@')), "self" => (intval($g['abook_self']) ? 'abook-self' : ''), "taggable" => 'taggable', @@ -368,7 +368,7 @@ class Acl extends \Zotlabs\Web\Controller { "name" => $g['name'], "id" => urlencode($g['id']), "xid" => $g['hash'], - "link" => $g['nick'], + "link" => (($g['nick']) ? $g['nick'] : $g['url']), "nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']), "self" => (intval($g['abook_self']) ? 'abook-self' : ''), "taggable" => '', |