hugolib: Make .Site.Sections return the top level sections

See #3591

diff --git a/hugolib/site_sections.go b/hugolib/site_sections.go
index f8d9c9d1f30c9575fb90186e606c5f492a3538ca..1dd010092990f8d4326e2ec20d44d15372aac4ac 100644 (file)
--- a/hugolib/site_sections.go
+++ b/hugolib/site_sections.go
@@ -19,33 +19,16 @@ import (
        "strconv"
        "strings"
 
-       "github.com/gohugoio/hugo/helpers"
        radix "github.com/hashicorp/go-immutable-radix"
 )
 
-// Deprecated: Use .Site.Home.Sections.
-// TODO(bep) Hugo 0.23 = Reuse as an alias for home's sections.
-func (s *SiteInfo) Sections() Taxonomy {
-
-       helpText := `In Hugo 0.22 we introduced nested sections, so this method now returns an empty taxonomy.
-       
-To list sections with its pages, you can do something like this:
-
-{{ range $.Site.Home.Sections }}
-  Section: {{ .Title }}
-  {{ range .Pages }}
-     Section Page: {{ .Title }}
-  {{ end }}
-{{ end }}
-
-To get a specific section, you can do this:
-
-{{ $section := $.Site.GetPage "section" "blog" }}
-`
-
-       helpers.Deprecated("Site", "Sections", helpText, true)
-
-       return Taxonomy{}
+// Sections returns the top level sections.
+func (s *SiteInfo) Sections() Pages {
+       home, err := s.Home()
+       if err == nil {
+               return home.Sections()
+       }
+       return nil
 }
 
 // Home is a shortcut to the home page, equivalent to .Site.GetPage "home".

diff --git a/hugolib/site_sections_test.go b/hugolib/site_sections_test.go
index 7479c45fc655ff8e8e3284f4c07c087ce1123cd7..77a85099c1cf4da74a4c4bf8f34b760ef5da4a92 100644 (file)
--- a/hugolib/site_sections_test.go
+++ b/hugolib/site_sections_test.go
@@ -246,6 +246,7 @@ PAG|{{ .Title }}|{{ $sect.InSection . }}
        assert.NotNil(home)
 
        assert.Len(home.Sections(), 9)
+       assert.Equal(home.Sections(), s.Info.Sections())
 
        rootPage := s.getPage(KindPage, "mypage.md")
        assert.NotNil(rootPage)