tpl: Fix baseof.html in error message
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sat, 6 Oct 2018 10:04:29 +0000 (12:04 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sat, 6 Oct 2018 10:04:29 +0000 (12:04 +0200)
This fix should also make the template loadin slightly faster, as we avoid to reparse the baseof.html files more than one time.

Fixes #5288

tpl/tplimpl/template.go

index f19c312ec92e34835928da7492ed6fc6aad79018..54f4aeda7fcfb3554e6ed28fb57d4bf983567c24 100644 (file)
@@ -568,7 +568,7 @@ func (t *htmlTemplates) handleMaster(name, overlayFilename, masterFilename strin
                        return err
                }
 
-               masterTpl, err = t.t.New(overlayFilename).Parse(templ)
+               masterTpl, err = t.t.New(masterFilename).Parse(templ)
                if err != nil {
                        return err
                }
@@ -609,7 +609,7 @@ func (t *textTemplates) handleMaster(name, overlayFilename, masterFilename strin
                        return err
                }
 
-               masterTpl, err = t.t.New(overlayFilename).Parse(templ)
+               masterTpl, err = t.t.New(masterFilename).Parse(templ)
                if err != nil {
                        return err
                }