hugolib: Do not fall back to site title if not set in content file
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 26 Mar 2019 13:33:09 +0000 (14:33 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 26 Mar 2019 14:49:32 +0000 (15:49 +0100)
See #5784

hugolib/page__meta.go
hugolib/page_test.go

index 2c6b0a85d78c3f6a2441f4c0e9123a9302019e85..9f5f369b3ad3e4893ca48a7a6c8fa1d385387175 100644 (file)
@@ -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
index f243740c65e2d80f4f34dfd116d07aba54aca28f..570d09ac657161ddd979d2a4ce07efe8a7282cc5 100644 (file)
@@ -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!"
 ---