From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue, 26 Mar 2019 13:33:09 +0000 (+0100)
Subject: hugolib: Do not fall back to site title if not set in content file
X-Git-Tag: v0.55.0~36
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9bc6187b8;p=brevno-suite%2Fhugo

hugolib: Do not fall back to site title if not set in content file

See #5784
---

diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go
index 2c6b0a85..9f5f369b 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 f243740c..570d09ac 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!"
 ---