phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-02 15:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpl: Fix error with unicode in file paths

Browse source 
Add url.QueryUnescape before reading file which allows files with
unicode in their paths to be read.

Fixes #6996
This commit is contained in:
Sam Smith 2020-03-07 18:56:02 +00:00 committed by Bjørn Erik Pedersen
parent 108314444b
commit c4fa2f0799
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tpl/data/data_test.go
View file

@ -157,6 +157,11 @@ func TestGetJSON(t *testing.T) {
"",
false,
},
{
`pass/üńīçøðê-url.json`,
`{"gomeetup":["Sydney","San Francisco","Stockholm"]}`,
map[string]interface{}{"gomeetup": []interface{}{"Sydney", "San Francisco", "Stockholm"}},
},
} {
msg := qt.Commentf("Test %d", i)

7
tpl/data/resources.go
View file

@ -16,6 +16,7 @@ package data
import (
"io/ioutil"
"net/http"
"net/url"
"path/filepath"
"time"
@ -107,7 +108,11 @@ func getLocal(url string, fs afero.Fs, cfg config.Provider) ([]byte, error) {
func (ns *Namespace) getResource(cache *filecache.Cache, unmarshal func(b []byte) (bool, error), req *http.Request) error {
switch req.URL.Scheme {
case "":
b, err := getLocal(req.URL.String(), ns.deps.Fs.Source, ns.deps.Cfg)
url, err := url.QueryUnescape(req.URL.String())
if err != nil {
return err
}
b, err := getLocal(url, ns.deps.Fs.Source, ns.deps.Cfg)
if err != nil {
return err
}