summaryrefslogtreecommitdiffstats
path: root/hugolib
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-03-26 14:33:09 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-03-26 15:49:32 +0100
commit9bc6187b8337c4a370bd3f21130a764d9ef6f7b3 (patch)
treea06cbcfca7213bec263c387aaa67241f77c74235 /hugolib
parent10bb614a70db22c01c9a52054ede35bc0a01aa24 (diff)
hugolib: Do not fall back to site title if not set in content file
See #5784
Diffstat (limited to 'hugolib')
-rw-r--r--hugolib/page__meta.go2
-rw-r--r--hugolib/page_test.go6
2 files changed, 5 insertions, 3 deletions
diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go
index 2c6b0a85d..9f5f369b3 100644
--- a/hugolib/page__meta.go
+++ b/hugolib/page__meta.go
@@ -545,7 +545,7 @@ func (p *pageMeta) applyDefaultValues() error {
}
}
- if p.title == "" {
+ if p.title == "" && p.f.IsZero() {
switch p.Kind() {
case page.KindHome:
p.title = p.s.Info.title
diff --git a/hugolib/page_test.go b/hugolib/page_test.go
index f243740c6..570d09ac6 100644
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -1175,8 +1175,10 @@ func TestPageWithZeroFile(t *testing.T) {
}
func TestHomePageWithNoTitle(t *testing.T) {
- b := newTestSitesBuilder(t).WithSimpleConfigFile().
- WithTemplatesAdded("index.html", "Title|{{ with .Title }}{{ . }}{{ end }}|")
+ b := newTestSitesBuilder(t).WithConfigFile("toml", `
+title = "Site Title"
+`)
+ b.WithTemplatesAdded("index.html", "Title|{{ with .Title }}{{ . }}{{ end }}|")
b.WithContent("_index.md", `---
description: "No title for you!"
---