serv/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-29 07:03:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use path not filepath in template filenames (#21993) (#22022)

Browse source 
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>
This commit is contained in:
zeripath 2022-12-04 05:58:58 +00:00 committed by GitHub
parent da956b863b
commit c7770fa502
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/issue/template/unmarshal.go
View file

@ -7,7 +7,7 @@ package template
import ( import (
"fmt" "fmt"
"io" "io"
"path/filepath" "path"
"strconv" "strconv"
"code.gitea.io/gitea/modules/git" "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 // UnmarshalFromEntry parses out a valid template from the blob in entry
func UnmarshalFromEntry(entry *git.TreeEntry, dir string) (*api.IssueTemplate, error) { 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 // 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 could be a valid markdown with two horizontal lines, or an invalid markdown with wrong metadata.
it.Content = string(content) 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) it.About, _ = util.SplitStringAtByteN(it.Content, 80)
} else { } else {
it.Content = templateBody it.Content = templateBody