Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / forum / utils / userlinking.py

diff --git a/forum/utils/userlinking.py b/forum/utils/userlinking.py
index 39f8bbbe6a3de28d385914f96f6e2ff5cda35c27..da476ee9cc9bf58c07d5f1d34ecb74e1b07aee13 100644 (file)
--- a/forum/utils/userlinking.py
+++ b/forum/utils/userlinking.py
@@ -17,7 +17,7 @@ def find_best_match_in_name(content,  uname,  fullname,  start_index):
             
     return uname    
 
-APPEAL_PATTERN = re.compile(r'@\w+')
+APPEAL_PATTERN = re.compile(r'(?<!\w)@\w+')
 
 def auto_user_link(node, content):