From e538ff27704cddb1a99efc1a6be19e134f97355f Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 4 Dec 2015 21:30:33 -0500 Subject: fix #1829 and fix #890 --- modules/mailer/mail.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/mailer') diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index 680a3c483e..456f850338 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -125,7 +125,7 @@ func SendIssueNotifyMail(u, owner *models.User, repo *models.Repository, issue * subject := fmt.Sprintf("[%s] %s (#%d)", repo.Name, issue.Name, issue.Index) content := fmt.Sprintf("%s
-
View it on Gogs.", - base.RenderSpecialLink([]byte(issue.Content), owner.Name+"/"+repo.Name), + base.RenderSpecialLink([]byte(issue.Content), owner.Name+"/"+repo.Name, repo.ComposeMetas()), setting.AppUrl, owner.Name, repo.Name, issue.Index) msg := NewMessage(tos, subject, content) msg.Info = fmt.Sprintf("Subject: %s, issue notify", subject) @@ -148,7 +148,7 @@ func SendIssueMentionMail(r macaron.Render, u, owner *models.User, data["IssueLink"] = fmt.Sprintf("%s/%s/issues/%d", owner.Name, repo.Name, issue.Index) data["Subject"] = subject data["ActUserName"] = u.DisplayName() - data["Content"] = string(base.RenderSpecialLink([]byte(issue.Content), owner.Name+"/"+repo.Name)) + data["Content"] = string(base.RenderSpecialLink([]byte(issue.Content), owner.Name+"/"+repo.Name, repo.ComposeMetas())) body, err := r.HTMLString(string(NOTIFY_MENTION), data) if err != nil { -- cgit v1.2.3