aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-03 15:36:56 -0700
committerzotlabs <mike@macgirvin.com>2017-10-03 15:36:56 -0700
commit58155864cb7318321e70025ce67ca4453efee489 (patch)
tree2f3153e7f7603e6026416a205e1f651f8d3f1514
parent9cf9217686841bfceb7e2c03b10da88f006f4a5f (diff)
downloadvolse-hubzilla-58155864cb7318321e70025ce67ca4453efee489.tar.gz
volse-hubzilla-58155864cb7318321e70025ce67ca4453efee489.tar.bz2
volse-hubzilla-58155864cb7318321e70025ce67ca4453efee489.zip
urlencode hashes from mod_acl
-rw-r--r--Zotlabs/Module/Acl.php4
-rw-r--r--include/text.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 9c5f6653b..ce1064568 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -343,7 +343,7 @@ class Acl extends \Zotlabs\Web\Controller {
"photo" => "images/twopeople.png",
"name" => $g['name'] . (($type === 'f') ? '' : '+'),
"id" => $g['id'] . (($type === 'f') ? '' : '+'),
- "xid" => $g['hash'],
+ "xid" => urlencode($g['hash']),
"link" => $g['nick'],
"nick" => substr($g['nick'],0,strpos($g['nick'],'@')),
"self" => (intval($g['abook_self']) ? 'abook-self' : ''),
@@ -357,7 +357,7 @@ class Acl extends \Zotlabs\Web\Controller {
"photo" => $g['micro'],
"name" => $g['name'],
"id" => $g['id'],
- "xid" => $g['hash'],
+ "xid" => urlencode($g['hash']),
"link" => $g['nick'],
"nick" => (($g['nick']) ? substr($g['nick'],0,strpos($g['nick'],'@')) : $g['nick']),
"self" => (intval($g['abook_self']) ? 'abook-self' : ''),
diff --git a/include/text.php b/include/text.php
index bd802b2c1..80914747b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2412,7 +2412,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
}
if(! $replaced) {
- //base tag has the tags name only
+ // base tag has the tags name only
if((substr($tag,0,7) === '#&quot;') && (substr($tag,-6,6) === '&quot;')) {
$basetag = substr($tag,7);