diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-17 12:59:41 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-17 13:06:39 +0200 |
| commit | ab40ce679f1679d76f47652711fc30348a2efafd (patch) | |
| tree | ac825b6938b43ab4bb0bd395e74d8b1905adf14d | |
| parent | 416493b548a9bbaa27758fba9bab50a22b680e9d (diff) | |
Revert the 0.57 home.Pages change
In 0.57 we change the behaviour of home.Pages to be in line with the other sections. This has created a lot noise and breakage in the wild.
This commit reverts that change, but adds a warning that we will change this in 0.58 and that you should consider using .Site.RegularPages if that is what you want.
| -rw-r--r-- | hugolib/hugo_smoke_test.go | 2 | ||||
| -rw-r--r-- | hugolib/page.go | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/hugolib/hugo_smoke_test.go b/hugolib/hugo_smoke_test.go index 539e79729..2121738a9 100644 --- a/hugolib/hugo_smoke_test.go +++ b/hugolib/hugo_smoke_test.go @@ -193,7 +193,7 @@ Some **Markdown** in JSON shortcode. b.AssertFileContent("public/index.html", "home|In English", "Site params: Rules", - "Pages: Pages(6)|Data Pages: Pages(6)", + "Pages: Pages(18)|Data Pages: Pages(18)", "Paginator: 1", "First Site: In English", "RelPermalink: /", diff --git a/hugolib/page.go b/hugolib/page.go index 306ca7b0f..f8f6741d2 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -146,7 +146,9 @@ func (p *pageState) RegularPages() page.Pages { switch p.Kind() { case page.KindPage: - case page.KindSection, page.KindHome, page.KindTaxonomyTerm: + case page.KindHome: + pages = p.s.RegularPages() + case page.KindSection, page.KindTaxonomyTerm: pages = p.getPages() case page.KindTaxonomy: all := p.Pages() @@ -172,7 +174,12 @@ func (p *pageState) Pages() page.Pages { switch p.Kind() { case page.KindPage: - case page.KindSection, page.KindHome: + case page.KindHome: + // See https://github.com/gohugoio/hugo/issues/6238 + // Note: When making the change below, also remember RegularPages. + helpers.DistinctWarnLog.Println(`In the next Hugo version (0.58.0) we will change how $home.Pages behaves. If you want to list all regular pages, replace .Pages or .Data.Pages with .Site.RegularPages in your home page template.`) + pages = p.s.RegularPages() + case page.KindSection: pages = p.getPagesAndSections() case page.KindTaxonomy: termInfo := p.bucket |