From 47c8f329679e474f3ec13ef5719e16d0ab5613db Mon Sep 17 00:00:00 2001 From: bep Date: Sat, 31 Jan 2015 19:14:13 +0100 Subject: [PATCH] Prevent site config being overwritten Fixed #867 --- hugolib/page.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hugolib/page.go b/hugolib/page.go index 2cae1f561..6422474bf 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -199,14 +199,20 @@ func (p *Page) getRenderingConfig() *helpers.Blackfriday { pageParam := p.GetParam("blackfriday") siteParam := viper.GetStringMap("blackfriday") + combinedParam := make(map[string]interface{}) + + for k, v := range siteParam { + combinedParam[k] = v + } + if pageParam != nil { pageConfig := cast.ToStringMap(pageParam) for key, value := range pageConfig { - siteParam[key] = value + combinedParam[key] = value } } p.renderingConfig = new(helpers.Blackfriday) - if err := mapstructure.Decode(siteParam, p.renderingConfig); err != nil { + if err := mapstructure.Decode(combinedParam, p.renderingConfig); err != nil { jww.FATAL.Printf("Failed to get rendering config for %s:\n%s", p.BaseFileName(), err.Error()) } })