diff options
| author | Peter Smit <peter@smitmail.eu> | 2015-02-09 12:56:46 +0200 |
|---|---|---|
| committer | Peter Smit <peter@smitmail.eu> | 2015-02-09 12:56:46 +0200 |
| commit | 5cd887dba5dea90470435bfa338b70c5c036019e (patch) | |
| tree | 2bfc7ced50e2933adcc5e8c4d677b4e1dca08e29 /modules/base | |
| parent | 6ed96b7a20b8b53ef958808cc414d59b72b7fa5c (diff) | |
| download | gitea-5cd887dba5dea90470435bfa338b70c5c036019e.tar.gz gitea-5cd887dba5dea90470435bfa338b70c5c036019e.zip | |
Fixes #921
Fixes #921 and makes the Mention regexp be in line with the others
Diffstat (limited to 'modules/base')
| -rw-r--r-- | modules/base/markdown.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/base/markdown.go b/modules/base/markdown.go index b5f397dce0..4a7adc8a48 100644 --- a/modules/base/markdown.go +++ b/modules/base/markdown.go @@ -106,7 +106,7 @@ func (options *CustomRender) Image(out *bytes.Buffer, link []byte, title []byte, } var ( - MentionPattern = regexp.MustCompile(`((^|\s)@)[0-9a-zA-Z_]{1,}`) + MentionPattern = regexp.MustCompile(`(\s|^)@[0-9a-zA-Z_]+`) 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]+`) @@ -128,8 +128,9 @@ func RenderSpecialLink(rawBytes []byte, urlPrefix string) []byte { if !inCodeBlock && !bytes.HasPrefix(line, tab) { ms := MentionPattern.FindAll(line, -1) for _, m := range ms { + m = bytes.TrimSpace(m) line = bytes.Replace(line, m, - []byte(fmt.Sprintf(`<a href="%s/%s">%s</a>`, setting.AppSubUrl, m[2:], m)), -1) + []byte(fmt.Sprintf(`<a href="%s/%s">%s</a>`, setting.AppSubUrl, m[1:], m)), -1) } } |