From c13d368746992eb39a33f065ca808e129baec4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 25 Apr 2021 16:57:09 +0200 Subject: [PATCH] resources/page: Fix permalinks pattern detection for some of the sections variants See #8363 --- resources/page/permalinks.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/page/permalinks.go b/resources/page/permalinks.go index aaffcdc21..aa20da4ed 100644 --- a/resources/page/permalinks.go +++ b/resources/page/permalinks.go @@ -51,10 +51,6 @@ func (p PermalinkExpander) callback(attr string) (pageToPermaAttribute, bool) { return callback, true } - if referenceTime.Format(attr) != attr { - return p.pageToPermalinkDate, true - } - if strings.HasPrefix(attr, "sections[") { fn := p.toSliceFunc(strings.TrimPrefix(attr, "sections")) return func(p Page, s string) (string, error) { @@ -62,6 +58,11 @@ func (p PermalinkExpander) callback(attr string) (pageToPermaAttribute, bool) { }, true } + // Make sure this comes after all the other checks. + if referenceTime.Format(attr) != attr { + return p.pageToPermalinkDate, true + } + return nil, false }