From a985efcecf44afe1d252690ec0a00cf077974f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 21 May 2020 11:25:00 +0200 Subject: Fix GetPage on section/bundle name overlaps 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 --- helpers/path.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'helpers') diff --git a/helpers/path.go b/helpers/path.go index 29e1e6071..01c452607 100644 --- a/helpers/path.go +++ b/helpers/path.go @@ -665,3 +665,12 @@ func FileContainsAny(filename string, subslices [][]byte, fs afero.Fs) (bool, er func Exists(path string, fs afero.Fs) (bool, error) { return afero.Exists(fs, path) } + +// AddTrailingSlash adds a trailing Unix styled slash (/) if not already +// there. +func AddTrailingSlash(path string) string { + if !strings.HasSuffix(path, "/") { + path += "/" + } + return path +} -- cgit v1.2.3