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

config: Fix merge of config with map[string]string values.

Browse Source 
Fixes #8679
This commit is contained in:
Bjørn Erik Pedersen
2021-06-22 09:53:37 +02:00
parent 9312059888
commit 4a9d408fe0
9 changed files with 133 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hugolib/config.go
View File

@@ -64,10 +64,6 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
l := configLoader{ConfigSourceDescriptor: d, cfg: config.New()}
if err := l.applyConfigDefaults(); err != nil {
return l.cfg, configFiles, err
}
for _, name := range d.configFilenames() {
var filename string
filename, err := l.loadConfig(name)
@@ -78,6 +74,10 @@ 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 {
@@ -298,7 +298,7 @@ func (l configLoader) applyConfigDefaults() error {
"enableInlineShortcodes": false,
}
l.cfg.Merge("", defaultSettings)
l.cfg.SetDefaults(defaultSettings)
return nil
}