hugo

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

git clone git://git.shimmy1996.com/hugo.git
commit 58802de3138b5b72b7600de75636ccee27bb6c0a
parent 3a2a4c3b07f82527765cbeaa33f53ab7e2314491
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Tue, 15 Mar 2016 10:22:08 +0100

No block support in shortcodes

So no need to check them.

Diffstat:
Mtpl/template.go | 3++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tpl/template.go b/tpl/template.go
@@ -402,7 +402,8 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) {
 			var baseTemplatePath string
 
 			// Ace and Go templates may have both a base and inner template.
-			if filepath.Ext(path) != ".amber" && !strings.HasSuffix(filepath.Dir(path), "partials") {
+			pathDir := filepath.Dir(path)
+			if filepath.Ext(path) != ".amber" && !strings.HasSuffix(pathDir, "partials") && !strings.HasSuffix(pathDir, "shortcodes") {
 
 				innerMarkers := goTemplateInnerMarkers
 				baseFileName := fmt.Sprintf("%s.html", baseFileBase)