Skip to content

Commit 16d2cf0

Browse files
authored
Fix custom mailer template on Windows (#24081)
Fix #24075 Fix #23873 From the log: ``` 2023/04/02 19:41:46 .../templates/mailer.go:68:1() [T] Adding mailer template for \issue\default from "C:\gitea\custom\templates\mail\issue\default.tmpl" ``` That `assetName ` on Windows is wrong. Gitea only uses slash `/`.
1 parent d562b41 commit 16d2cf0

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

modules/templates/mailer.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
"code.gitea.io/gitea/modules/log"
1515
"code.gitea.io/gitea/modules/setting"
16+
"code.gitea.io/gitea/modules/util"
1617
"code.gitea.io/gitea/modules/watcher"
1718
)
1819

@@ -65,6 +66,7 @@ func Mailer(ctx context.Context) (*texttmpl.Template, *template.Template) {
6566
}
6667

6768
assetName := strings.TrimSuffix(name, ".tmpl")
69+
assetName = util.PathJoinRelX(assetName)
6870
log.Trace("Adding mailer template for %s from %q", assetName, path)
6971
buildSubjectBodyTemplate(subjectTemplates,
7072
bodyTemplates,

0 commit comments

Comments
 (0)