Fix sub-folder baseURL handling for Page resources

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

View file

@ -26,6 +26,10 @@ import (
type PathSpec struct {
BaseURL
// If the baseURL contains a base path, e.g. https://example.com/docs, then "/docs" will be the BasePath.
// This will not be set if canonifyURLs is enabled.
BasePath string
disablePathToLower bool
removePathAccents bool
uglyURLs bool
@ -124,6 +128,13 @@ func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) (*PathSpec, error) {
ProcessingStats: NewProcessingStats(lang),
}
if !ps.canonifyURLs {
basePath := ps.BaseURL.url.Path
if basePath != "" && basePath != "/" {
ps.BasePath = basePath
}
}
publishDir := ps.AbsPathify(cfg.GetString("publishDir")) + FilePathSeparator
// If root, remove the second '/'
if publishDir == "//" {