From: 无闻 <u@gogs.io>
Date: Sat, 7 Feb 2015 00:03:35 +0000 (-0500)
Subject: Merge pull request #826 from deringer/dev
X-Git-Tag: v0.9.99~1494
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ddddad9792d203c3ac3e6406aac0bf38235018dd;p=gitea.git

Merge pull request #826 from deringer/dev

Fix user mention bug when parsing markdown documents
---

ddddad9792d203c3ac3e6406aac0bf38235018dd
diff --cc modules/base/markdown.go
index d3f3e5feaf,f18d459ff6..87aafda3e1
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@@ -106,10 -100,10 +106,10 @@@ func (options *CustomRender) Image(out 
  }
  
  var (
- 	MentionPattern     = regexp.MustCompile(`@[0-9a-zA-Z_]{1,}`)
+ 	MentionPattern     = regexp.MustCompile(`(\s@)[0-9a-zA-Z_]{1,}`)
  	commitPattern      = regexp.MustCompile(`(\s|^)https?.*commit/[0-9a-zA-Z]+(#+[0-9a-zA-Z-]*)?`)
  	issueFullPattern   = regexp.MustCompile(`(\s|^)https?.*issues/[0-9]+(#+[0-9a-zA-Z-]*)?`)
 -	issueIndexPattern  = regexp.MustCompile(`#[0-9]+`)
 +	issueIndexPattern  = regexp.MustCompile(`( |^)#[0-9]+`)
  	sha1CurrentPattern = regexp.MustCompile(`\b[0-9a-f]{40}\b`)
  )