mirror of
https://github.com/gohugoio/hugo.git
synced 2025-04-27 14:10:31 +03:00
Fix sub-folder baseURL handling for Page resources
I.e. images etc. Fixes #4228
This commit is contained in:
parent
54a89cde69
commit
f25d8a9e17
9 changed files with 136 additions and 52 deletions
|
@ -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 == "//" {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue