From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sun, 25 Apr 2021 14:57:09 +0000 (+0200)
Subject: resources/page: Fix permalinks pattern detection for some of the sections variants
X-Git-Tag: v0.83.0~18
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c13d368746992eb39a33f065ca808e129baec4ef;p=brevno-suite%2Fhugo

resources/page: Fix permalinks pattern detection for some of the sections variants

See #8363
---

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
 }