diff options
| author | zeripath <art27@cantab.net> | 2022-12-04 05:58:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 13:58:58 +0800 |
| commit | c7770fa50213b979ba0a3cd20f9008268e398140 (patch) | |
| tree | 0ce65ffde25ddc4ba173a3f445d257ea52fc87dc /modules | |
| parent | da956b863b0f623fccb47b3168c4560cbe1282ab (diff) | |
| download | gitea-c7770fa50213b979ba0a3cd20f9008268e398140.tar.gz gitea-c7770fa50213b979ba0a3cd20f9008268e398140.zip | |
Use path not filepath in template filenames (#21993) (#22022)
Backport #21993
Paths in git are always separated by `/` not `\` - therefore we should
`path` and not `filepath`
Fix #21987
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/issue/template/unmarshal.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/issue/template/unmarshal.go b/modules/issue/template/unmarshal.go index 3398719cf6..9b684f1bf7 100644 --- a/modules/issue/template/unmarshal.go +++ b/modules/issue/template/unmarshal.go @@ -7,7 +7,7 @@ package template import ( "fmt" "io" - "path/filepath" + "path" "strconv" "code.gitea.io/gitea/modules/git" @@ -44,7 +44,7 @@ func Unmarshal(filename string, content []byte) (*api.IssueTemplate, error) { // UnmarshalFromEntry parses out a valid template from the blob in entry func UnmarshalFromEntry(entry *git.TreeEntry, dir string) (*api.IssueTemplate, error) { - return unmarshalFromEntry(entry, filepath.Join(dir, entry.Name())) + return unmarshalFromEntry(entry, path.Join(dir, entry.Name())) // Filepaths in Git are ALWAYS '/' separated do not use filepath here } // UnmarshalFromCommit parses out a valid template from the commit @@ -109,7 +109,7 @@ func unmarshal(filename string, content []byte) (*api.IssueTemplate, error) { // It could be a valid markdown with two horizontal lines, or an invalid markdown with wrong metadata. it.Content = string(content) - it.Name = filepath.Base(it.FileName) + it.Name = path.Base(it.FileName) // paths in Git are always '/' separated - do not use filepath! it.About, _ = util.SplitStringAtByteN(it.Content, 80) } else { it.Content = templateBody |