Optimize for the common case in Blackfriday config
authorbep <bjorn.erik.pedersen@gmail.com>
Sat, 31 Jan 2015 22:45:38 +0000 (23:45 +0100)
committerbep <bjorn.erik.pedersen@gmail.com>
Sat, 31 Jan 2015 22:45:38 +0000 (23:45 +0100)
hugolib/page.go

index fcb07d3099951a48b0806700dc79d3609b0d6540..d85ea92d50bd60ec69ce138e505c93d1a4c4b524 100644 (file)
@@ -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
                        }