From 58802de3138b5b72b7600de75636ccee27bb6c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 15 Mar 2016 10:22:08 +0100 Subject: [PATCH] No block support in shortcodes So no need to check them. --- tpl/template.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tpl/template.go b/tpl/template.go index 253fee2f4..54e16fcd2 100644 --- 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)