issue with mentions and xchans with @ or /

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(

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,' '));