linkify @person and @person@domain.com tags

1 files changed, 11 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 07810a50e..870a4c33b 100644
--- a/boot.php
+++ b/boot.php
@@ -1300,8 +1300,17 @@ function activity_match($haystack,$needle) {
 
 if(! function_exists('get_tags')) {
 function get_tags($s) {
-	if(preg_match_all('/([@#][^ ,.:?\-]*)[ ,.:?\-]/',$s,$match))
-		return $match[1];
+	$ret = array();
+	if(preg_match_all('/([@#][^ ,:?]*)[ ,:?]/',$s,$match)) {
+		foreach($match[1] as $match) {
+			if(substr($match,-1,1) === '.')
+				$ret[] = substr($match,0,-1);
+			else
+				$ret[] = $match;
+		}
+	}
+
+	return $ret;
 }}