Permalink
Browse files

hugolib: Prevent decoding pageParam in common cases

  • Loading branch information...
bogem authored and bep committed Apr 6, 2017
1 parent 6498d73 commit e98f885b8af27f5473a89d31d0b1f02e61e8a5ec
Showing with 9 additions and 4 deletions.
  1. +9 −4 hugolib/page.go
View
@@ -606,15 +606,20 @@ func (p *Page) renderContent(content []byte) []byte {
}
func (p *Page) getRenderingConfig() *helpers.Blackfriday {
p.renderingConfigInit.Do(func() {
pageParam := cast.ToStringMap(p.GetParam("blackfriday"))
p.renderingConfig = p.s.ContentSpec.NewBlackfriday()
if p.Language() == nil {
panic(fmt.Sprintf("nil language for %s with source lang %s", p.BaseFileName(), p.lang))
}
p.renderingConfig = p.s.ContentSpec.NewBlackfriday()
if err := mapstructure.Decode(pageParam, p.renderingConfig); err != nil {
bfParam := p.GetParam("blackfriday")
if bfParam == nil {
return
}
pageParam := cast.ToStringMap(bfParam)
if err := mapstructure.Decode(pageParam, &p.renderingConfig); err != nil {
p.s.Log.FATAL.Printf("Failed to get rendering config for %s:\n%s", p.BaseFileName(), err.Error())
}

0 comments on commit e98f885

Please sign in to comment.