aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Acl.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-05 19:24:03 -0700
committerzotlabs <mike@macgirvin.com>2017-10-05 19:24:03 -0700
commitd2e22d8c2f5ee7c0bca1fa63d39a6822582106e8 (patch)
tree305fbcd0a1e55de48d5e8a406c002f61f3512079 /Zotlabs/Module/Acl.php
parent2862baeee1cbecead3c9d38d2798140ac0256d1a (diff)
parent0ddc3e4af2fe70159b36f86cb367d1a24ec6ac71 (diff)
downloadvolse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.tar.gz
volse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.tar.bz2
volse-hubzilla-d2e22d8c2f5ee7c0bca1fa63d39a6822582106e8.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Module/Acl.php')
-rw-r--r--Zotlabs/Module/Acl.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 9c5f6653b..e164875e8 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -342,7 +342,7 @@ class Acl extends \Zotlabs\Web\Controller {
"type" => "c",
"photo" => "images/twopeople.png",
"name" => $g['name'] . (($type === 'f') ? '' : '+'),
- "id" => $g['id'] . (($type === 'f') ? '' : '+'),
+ "id" => urlencode($g['id']) . (($type === 'f') ? '' : '+'),
"xid" => $g['hash'],
"link" => $g['nick'],
"nick" => substr($g['nick'],0,strpos($g['nick'],'@')),
@@ -356,7 +356,7 @@ class Acl extends \Zotlabs\Web\Controller {
"type" => "c",
"photo" => $g['micro'],
"name" => $g['name'],
- "id" => $g['id'],
+ "id" => urlencode($g['id']),
"xid" => $g['hash'],
"link" => $g['nick'],
"nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']),