Browse Source

Fix panic when injecting a template with nil data

master
Simon Ser 4 years ago
parent
commit
c38b1d47f9
No known key found for this signature in database GPG Key ID: FDE7BE0E88F5E48
1 changed files with 12 additions and 1 deletions
  1. +12
    -1
      template.go

+ 12
- 1
template.go View File

@@ -88,8 +88,19 @@ func (r *renderer) Render(w io.Writer, name string, data interface{}, ectx echo.
// ectx is the raw *echo.context, not our own *Context
ctx := ectx.Get("context").(*Context)

var renderData RenderData
if data == nil {
renderData = &struct { BaseRenderData }{ *NewBaseRenderData(ctx) }
} else {
var ok bool
renderData, ok = data.(RenderData)
if !ok {
return fmt.Errorf("data passed to template '%v' doesn't implement RenderData", name)
}
}

for _, plugin := range ctx.Server.plugins {
if err := plugin.Inject(ctx, name, data.(RenderData)); err != nil {
if err := plugin.Inject(ctx, name, renderData); err != nil {
return fmt.Errorf("failed to run plugin '%v': %v", plugin.Name(), err)
}
}


Loading…
Cancel
Save