Fix filepath basename on Windows for SVG bindata (#12241)
This commit is contained in:
parent
84a419de98
commit
633f52c220
2 changed files with 3 additions and 5 deletions
|
@ -7,7 +7,6 @@
|
|||
package svg
|
||||
|
||||
import (
|
||||
"path"
|
||||
"path/filepath"
|
||||
|
||||
"code.gitea.io/gitea/modules/public"
|
||||
|
@ -22,7 +21,7 @@ func Discover() map[string]string {
|
|||
if matched {
|
||||
content, err := public.Asset(file)
|
||||
if err == nil {
|
||||
filename := path.Base(file)
|
||||
filename := filepath.Base(file)
|
||||
svgs[filename[:len(filename)-4]] = string(content)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,6 @@ package svg
|
|||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"path"
|
||||
"path/filepath"
|
||||
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
|
@ -18,11 +17,11 @@ import (
|
|||
func Discover() map[string]string {
|
||||
svgs := make(map[string]string)
|
||||
|
||||
files, _ := filepath.Glob(path.Join(setting.StaticRootPath, "public", "img", "svg", "*.svg"))
|
||||
files, _ := filepath.Glob(filepath.Join(setting.StaticRootPath, "public", "img", "svg", "*.svg"))
|
||||
for _, file := range files {
|
||||
content, err := ioutil.ReadFile(file)
|
||||
if err == nil {
|
||||
filename := path.Base(file)
|
||||
filename := filepath.Base(file)
|
||||
svgs[filename[:len(filename)-4]] = string(content)
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue