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.

diff --git a/hugolib/hugo_smoke_test.go b/hugolib/hugo_smoke_test.go
index 539e797295a321c68befe1315c7a8abd3ed3c7e1..2121738a903477990f4cf80e41a0515b2d37ee02 100644 (file)
--- 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 306ca7b0fbe5de0545eca3ad4e8c88d05c372df4..f8f6741d21539042815a852af44c682218bdb355 100644 (file)
--- 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