mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-14 20:33:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix default values when loading from config dir

Browse Source 
By waiting until we've loaded the config dir config before applying the default values.

Fixes #8763
This commit is contained in:
Bjørn Erik Pedersen
2021-07-15 15:31:50 +02:00
parent a70da2b74a
commit ae6cf93c84
2 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hugolib/config.go
View File

@@ -78,10 +78,6 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
}
}
if err := l.applyConfigDefaults(); err != nil {
return l.cfg, configFiles, err
}
if d.AbsConfigDir != "" {
dcfg, dirnames, err := config.LoadConfigFromDir(l.Fs, d.AbsConfigDir, l.Environment)
if err == nil {
@@ -97,6 +93,10 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
}
}
if err := l.applyConfigDefaults(); err != nil {
return l.cfg, configFiles, err
}
l.cfg.SetDefaultMergeStrategy()
// We create languages based on the settings, so we need to make sure that