hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit 47c8f329679e474f3ec13ef5719e16d0ab5613db
parent 659f71e6177f5691e8b8fe989d3b3d02bc64049b
Author: bep <bjorn.erik.pedersen@gmail.com>
Date:   Sat, 31 Jan 2015 19:14:13 +0100

Prevent site config being overwritten

Fixed #867

Diffstat:
Mhugolib/page.go | 10++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git 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())
 		}
 	})