From 47769d2640be7f49d9db154a161e6c9d84928ee3 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 8 Jun 2018 10:21:19 +0200
Subject: New regex to match mentions

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 lib/private/Comments/Comment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php
index 630844c444a..94c43be622b 100644
--- a/lib/private/Comments/Comment.php
+++ b/lib/private/Comments/Comment.php
@@ -225,7 +225,7 @@ class Comment implements IComment {
 	 *
 	 */
 	public function getMentions() {
-		$ok = preg_match_all('/\B(^@\w+|(?<=\s)@\w+)/i', $this->getMessage(), $mentions);
+		$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@[a-z0-9_\-@\.\']+/i", $this->getMessage(), $mentions);
 		if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
 			return [];
 		}
-- 
cgit v1.2.3