danog/gojekyll
1
0
Fork 0
mirror of https://github.com/danog/gojekyll.git synced 2025-01-23 07:51:18 +01:00
Code Issues Projects Releases Wiki Activity

Display filename for liquid render errors

Browse Source
This commit is contained in:
Oliver Steele 2017-06-27 22:56:41 -04:00
parent 242f33e498
commit 9ae0eae4c1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pipelines/pipeline.go
View File

@ -89,8 +89,8 @@ func (p *Pipeline) renderTemplate(b []byte, e templates.VariableMap, filename st
return b, err return b, err
} }
// ApplyLayout applies the named layout to bytes. // ApplyLayout applies the named layout to the data.
func (p *Pipeline) ApplyLayout(name string, b []byte, e templates.VariableMap) ([]byte, error) { func (p *Pipeline) ApplyLayout(name string, data []byte, e templates.VariableMap) ([]byte, error) {
for name != "" { for name != "" {
var lfm templates.VariableMap var lfm templates.VariableMap
t, err := p.FindLayout(name, &lfm) t, err := p.FindLayout(name, &lfm)
@ -98,16 +98,16 @@ func (p *Pipeline) ApplyLayout(name string, b []byte, e templates.VariableMap) (
return nil, err return nil, err
} }
le := templates.MergeVariableMaps(e, templates.VariableMap{ le := templates.MergeVariableMaps(e, templates.VariableMap{
"content": string(b), "content": string(data),
"layout": lfm, "layout": lfm,
}) })
b, err = t.Render(le) data, err = t.Render(le)
if err != nil { if err != nil {
return nil, err return nil, helpers.PathError(err, "render template", name)
} }
name = lfm.String("layout", "") name = lfm.String("layout", "")
} }
return b, nil return data, nil
} }
func (p *Pipeline) makeLocalLiquidEngine() liquid.Engine { func (p *Pipeline) makeLocalLiquidEngine() liquid.Engine {