hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit 646a52a5c5f52890f2d0270b68ba0f863047484a
parent e421696d02bfb8764ae57238e211ce0e85e9782e
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Sat,  6 Oct 2018 12:04:29 +0200

tpl: Fix baseof.html in error message

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

Diffstat:
Mtpl/tplimpl/template.go | 4++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tpl/tplimpl/template.go b/tpl/tplimpl/template.go
@@ -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
 		}