mirrors/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-29 15:10:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix sub-folder baseURL handling for Page resources

Browse source 
I.e. images etc.

Fixes #4228
This commit is contained in:
Bjørn Erik Pedersen 2018-01-05 11:07:50 +01:00
parent 54a89cde69
commit f25d8a9e17
9 changed files with 136 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

5
helpers/url.go
View file

@ -319,12 +319,11 @@ func AddContextRoot(baseURL, relativePath string) string {
// If canonifyURLs is set, we will globally prepend the absURL with any sub-folder,
// so avoid doing anything here to avoid getting double paths.
func (p *PathSpec) PrependBasePath(rel string) string {
basePath := p.BaseURL.url.Path
if !p.canonifyURLs && basePath != "" && basePath != "/" {
if p.BasePath != "" {
rel = filepath.ToSlash(rel)
// Need to prepend any path from the baseURL
hadSlash := strings.HasSuffix(rel, "/")
rel = path.Join(basePath, rel)
rel = path.Join(p.BasePath, rel)
if hadSlash {
rel += "/"
}