github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-12-01 15:49:11 -05:00
Code Issues Projects Releases Packages Wiki Activity

Use filepath.Join in locale resource getting

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2016-02-07 02:12:33 +01:00
parent 8d8e9dde51
commit 0586bf0dc3
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tpl/template_resources.go
View file

@ -158,15 +158,7 @@ func resGetRemote(url string, fs afero.Fs, hc *http.Client) ([]byte, error) {
// resGetLocal loads the content of a local file // resGetLocal loads the content of a local file
func resGetLocal(url string, fs afero.Fs) ([]byte, error) { func resGetLocal(url string, fs afero.Fs) ([]byte, error) {
p := "" filename := filepath.Join(viper.GetString("WorkingDir"), url)
workingDir := viper.GetString("WorkingDir")
if workingDir != "" {
p = workingDir
if !strings.HasSuffix(p, helpers.FilePathSeparator) {
p = p + helpers.FilePathSeparator
}
}
filename := p + url
if e, err := helpers.Exists(filename, fs); !e { if e, err := helpers.Exists(filename, fs); !e {
return nil, err return nil, err
} }