From 8b86b6f1a052960fc214ec59faffd7ad9b9fd0f4 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 13 May 2024 15:11:29 +0200 Subject: [PATCH] Rename Str2html to SanitizeHTML and clarify its behavior (followup) (take 2) In 801792e4dc Rename Str2html to SanitizeHTML and clarify its behavior (followup) the replacement was incorrect because c9d0e63c20 Remove unnecessary "Str2html" modifier from templates was not applied and Str2html should have not been present in the first place. Fixes: https://codeberg.org/forgejo/forgejo/issues/3554 (cherry picked from commit 337f4f9d87739990bcc60a9f0ecd03c74c49bc17) --- release-notes/8.0.0/fix/3744.md | 1 + templates/mail/issue/default.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 release-notes/8.0.0/fix/3744.md diff --git a/release-notes/8.0.0/fix/3744.md b/release-notes/8.0.0/fix/3744.md new file mode 100644 index 0000000000..5d5d3ef9fe --- /dev/null +++ b/release-notes/8.0.0/fix/3744.md @@ -0,0 +1 @@ +- mail notifications of pull requests push are empty diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 4e83dbcfdb..395b118d3e 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -30,7 +30,7 @@ {{.locale.Tr "mail.issue.action.force_push" .Doer.Name .Comment.Issue.PullRequest.HeadBranch $oldCommitLink $newCommitLink}} {{else}} - {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits) | SanitizeHTML}} + {{.locale.TrN (len .Comment.Commits) "mail.issue.action.push_1" "mail.issue.action.push_n" .Doer.Name .Comment.Issue.PullRequest.HeadBranch (len .Comment.Commits)}} {{end}}

{{end}}