From: Bjørn Erik Pedersen Date: Tue, 30 Dec 2025 11:57:00 +0000 (+0100) Subject: Revert "resources/page: Fix slugorcontentbasename for section pages" X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf1d20d735b89f83f2362241385bba82f7289cdd;p=brevno-suite%2Fhugo Revert "resources/page: Fix slugorcontentbasename for section pages" This reverts commit 25c7c18f9f8862f756835d3ac3faa4f114c344f6. See #14104 See #14325 --- diff --git a/resources/page/permalinks.go b/resources/page/permalinks.go index 49dc815d1..1d6078b4a 100644 --- a/resources/page/permalinks.go +++ b/resources/page/permalinks.go @@ -336,11 +336,6 @@ func (l PermalinkExpander) pageToPermalinkSectionSlugs(p Page, attr string) (str // pageToPermalinkContentBaseName returns the URL-safe form of the content base name. func (l PermalinkExpander) pageToPermalinkContentBaseName(p Page, _ string) (string, error) { - // For section pages with _index.md files, return empty string to match the behavior of pageToPermalinkFilename. - // Sections without files should use their directory name. - if p.PathInfo().IsBranchBundle() && p.File() != nil { - return "", nil - } return l.urlize(p.PathInfo().Unnormalized().BaseNameNoIdentifier()), nil } diff --git a/resources/page/permalinks_integration_test.go b/resources/page/permalinks_integration_test.go index 29bb55557..b33c599a7 100644 --- a/resources/page/permalinks_integration_test.go +++ b/resources/page/permalinks_integration_test.go @@ -457,39 +457,3 @@ title: aBc b = hugolib.Test(t, files) b.AssertFileExists("public/aBc/index.html", true) } - -// Issue 14104 -func TestIssue14104(t *testing.T) { - t.Parallel() - - files := ` --- hugo.toml -- -[permalinks.page] -foo = "/:sections[1:]/:slugorcontentbasename/" -[permalinks.section] -foo = "/:sections[1:]/:slugorcontentbasename/" --- content/foo/_index.md -- ---- -title: Foo ---- --- content/foo/bar/_index.md -- ---- -title: Bar ---- --- content/foo/bar/somepage.md -- ---- -title: Some Page ---- --- layouts/list.html -- -List|{{ .Kind }}|{{ .RelPermalink }}| --- layouts/single.html -- -Single|{{ .Kind }}|{{ .RelPermalink }}| -` - - b := hugolib.Test(t, files) - - // Section page should be at /bar/index.html, not /bar/bar/index.html - b.AssertFileContent("public/bar/index.html", "List|section|/bar/|") - // Regular page should be at /bar/somepage/index.html - b.AssertFileContent("public/bar/somepage/index.html", "Single|page|/bar/somepage/|") -}