Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-03-15 12:22:08 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-03-15 12:22:08 +0300
commit58802de3138b5b72b7600de75636ccee27bb6c0a (patch)
treef6659351fa9e02b56c0b752a4d01a04407d521e1 /tpl/template.go
parent3a2a4c3b07f82527765cbeaa33f53ab7e2314491 (diff)
No block support in shortcodes
So no need to check them.
Diffstat (limited to 'tpl/template.go')
-rw-r--r--tpl/template.go3
1 files changed, 2 insertions, 1 deletions
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)