diff options
| author | zotlabs <mike@macgirvin.com> | 2017-08-30 16:24:26 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-08-30 16:24:26 -0700 |
| commit | be097bf415c898c470e85e89cd059e7121517d15 (patch) | |
| tree | 21b7340618fc2090af81e688439161a10a0c89dd | |
| parent | f1b014b7eb2b44f4609a9e86c6fb0ae1bffd5403 (diff) | |
| download | volse-hubzilla-be097bf415c898c470e85e89cd059e7121517d15.tar.gz volse-hubzilla-be097bf415c898c470e85e89cd059e7121517d15.tar.bz2 volse-hubzilla-be097bf415c898c470e85e89cd059e7121517d15.zip | |
issue with mentions and xchans with @ or /
| -rw-r--r-- | Zotlabs/Module/Acl.php | 4 | ||||
| -rw-r--r-- | include/text.php | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 83fafbdff..19797e634 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -326,9 +326,7 @@ class Acl extends \Zotlabs\Web\Controller { if($r) { foreach($r as $g){ - // remove RSS feeds from ACLs - they are inaccessible - if(strpos($g['hash'],'/') && $type != 'a') - continue; + $g['hash'] = urlencode($g['hash']); if(in_array($g['hash'],$permitted) && $type == 'c' && (! $noforums)) { $contacts[] = array( diff --git a/include/text.php b/include/text.php index 1919e4b57..ea21e2184 100644 --- a/include/text.php +++ b/include/text.php @@ -2485,7 +2485,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d if(($t2) && (! $diaspora)) { //get the id - $tagcid = substr($newname,$t2 + 1); + $tagcid = urldecode(substr($newname,$t2 + 1)); if(strrpos($tagcid,' ')) $tagcid = substr($tagcid,0,strrpos($tagcid,' ')); |