mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-19 21:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetPage on section/bundle name overlaps

Browse Source 
In the internal Radix we stored the directory based nodes without a traling slash, e.g. `/blog`.

The original motivation was probably to make it easy to do prefix searching: Give me all ancestors.

This, however have lead to some ambigouty with overlapping directory names.

This particular problem was, however, not possible to work around in an easy way, so from now we store these as `/blog/`.

Fixes #7301
This commit is contained in:
Bjørn Erik Pedersen
2020-05-21 11:25:00 +02:00
parent 6c3c6686f5
commit a985efcecf
10 changed files with 212 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hugolib/pagecollections.go
View File

@@ -169,18 +169,20 @@ func (c *PageCollections) getPageNew(context page.Page, ref string) (page.Page,
func (c *PageCollections) getSectionOrPage(ref string) (*contentNode, string) {
var n *contentNode
s, v, found := c.pageMap.sections.LongestPrefix(ref)
pref := helpers.AddTrailingSlash(ref)
s, v, found := c.pageMap.sections.LongestPrefix(pref)
if found {
n = v.(*contentNode)
}
if found && s == ref {
if found && s == pref {
// A section
return n, ""
}
m := c.pageMap
filename := strings.TrimPrefix(strings.TrimPrefix(ref, s), "/")
langSuffix := "." + m.s.Lang()
@@ -224,9 +226,11 @@ func shouldDoSimpleLookup(ref string) bool {
func (c *PageCollections) getContentNode(context page.Page, isReflink bool, ref string) (*contentNode, error) {
ref = filepath.ToSlash(strings.ToLower(strings.TrimSpace(ref)))
if ref == "" {
ref = "/"
}
inRef := ref
navUp := strings.HasPrefix(ref, "..")
var doSimpleLookup bool
@@ -275,9 +279,11 @@ func (c *PageCollections) getContentNode(context page.Page, isReflink bool, ref
}
// Check if it's a taxonomy node
s, v, found := m.taxonomies.LongestPrefix(ref)
pref := helpers.AddTrailingSlash(ref)
s, v, found := m.taxonomies.LongestPrefix(pref)
if found {
if !m.onSameLevel(ref, s) {
if !m.onSameLevel(pref, s) {
return nil, nil
}
return v.(*contentNode), nil