From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 21 Jul 2021 09:34:26 +0000 (+0200)
Subject: navigation: Check Page first in URL()
X-Git-Tag: v0.86.0~3
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=32508045d36a0ca70d10216afc78e1804aa2186d;p=brevno-suite%2Fhugo

navigation: Check Page first in URL()

 In Hugo #8776 we added `pageRef`, a way to connect menu items in site config to pages.

This means that you now can have both a Page and a configured URL.

Having the configured URL as a fallback if the Page isn't found is obviously more useful, especially in multilingual sites.

See #8776
---

diff --git a/navigation/menu.go b/navigation/menu.go
index 7c6a1ccc..dd62f825 100644
--- a/navigation/menu.go
+++ b/navigation/menu.go
@@ -46,15 +46,19 @@ type MenuEntry struct {
 }
 
 func (m *MenuEntry) URL() string {
-	if m.ConfiguredURL != "" {
-		return m.ConfiguredURL
-	}
 
+	// Check page first.
+	// In Hugo 0.86.0 we added `pageRef`,
+	// a way to connect menu items in site config to pages.
+	// This means that you now can have both a Page
+	// and a configured URL.
+	// Having the configured URL as a fallback if the Page isn't found
+	// is obviously more useful, especially in multilingual sites.
 	if !types.IsNil(m.Page) {
 		return m.Page.RelPermalink()
 	}
 
-	return ""
+	return m.ConfiguredURL
 }
 
 // A narrow version of page.Page.