diff options
Diffstat (limited to 'services/mailer')
| -rw-r--r-- | services/mailer/mail.go | 8 | ||||
| -rw-r--r-- | services/mailer/mail_test.go | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 81cfb2e31a..f936229551 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -287,7 +287,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient } var mailSubject bytes.Buffer - if err := subjectTemplates.ExecuteTemplate(&mailSubject, string(tplName), mailMeta); err == nil { + if err := subjectTemplates.ExecuteTemplate(&mailSubject, tplName, mailMeta); err == nil { subject = sanitizeSubject(mailSubject.String()) if subject == "" { subject = fallback @@ -302,8 +302,8 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient var mailBody bytes.Buffer - if err := bodyTemplates.ExecuteTemplate(&mailBody, string(tplName), mailMeta); err != nil { - log.Error("ExecuteTemplate [%s]: %v", string(tplName)+"/body", err) + if err := bodyTemplates.ExecuteTemplate(&mailBody, tplName, mailMeta); err != nil { + log.Error("ExecuteTemplate [%s]: %v", tplName+"/body", err) } // Make sure to compose independent messages to avoid leaking user emails @@ -498,5 +498,5 @@ func actionToTemplate(issue *issues_model.Issue, actionType models.ActionType, if !ok { template = "issue/default" } - return + return typeName, name, template } diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 83955a5896..93837ba8c4 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -61,7 +61,7 @@ func prepareMailerTest(t *testing.T) (doer *user_model.User, repo *repo_model.Re issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1, Repo: repo, Poster: doer}).(*issues_model.Issue) assert.NoError(t, issue.LoadRepo(db.DefaultContext)) comment = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2, Issue: issue}).(*issues_model.Comment) - return + return doer, repo, issue, comment } func TestComposeIssueCommentMessage(t *testing.T) { |