Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

2 files changed, 5 insertions, 2 deletions

diff --git a/include/network.php b/include/network.php
index 8b7490a8a..26ed24de2 100644
--- a/include/network.php
+++ b/include/network.php
@@ -2052,4 +2052,4 @@ function jsonld_document_loader($url) {
 	}
 
 	return [];
-}
\ No newline at end of file
+}
diff --git a/include/text.php b/include/text.php
index c7417a19b..5be44c3cb 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2559,6 +2559,8 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i
 				$basetag = substr($tag,7);
 				$basetag = substr($basetag,0,-6);
 			}
+			else
+				$basetag = substr($tag,1);
 
 			//create text for link
 
@@ -2587,6 +2589,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i
 			'url'      => $url,
 			'contact'  => $r[0]
 		];
+
 	}
 
 	//is it a person tag?
@@ -3334,4 +3337,4 @@ function unique_multidim_array($array, $key) {
         $i++;
     }
     return $temp_array;
-} 
\ No newline at end of file
+}