From: bep <bjorn.erik.pedersen@gmail.com>
Date: Sat, 31 Jan 2015 22:45:38 +0000 (+0100)
Subject: Optimize for the common case in Blackfriday config
X-Git-Tag: v0.13~74
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b984ec96bc21af4dad479e47fb758b90b91ceceb;p=brevno-suite%2Fhugo

Optimize for the common case in Blackfriday config
---

diff --git a/hugolib/page.go b/hugolib/page.go
index fcb07d30..d85ea92d 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -199,14 +199,17 @@ 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
-		}
+		combinedParam := siteParam
 
 		if pageParam != nil {
+			combinedParam = make(map[string]interface{})
+
+			for k, v := range siteParam {
+				combinedParam[k] = v
+			}
+
 			pageConfig := cast.ToStringMap(pageParam)
+
 			for key, value := range pageConfig {
 				combinedParam[key] = value
 			}