shithub: hugo

Info  •  Files  •  Log  •  Branches

IsMenuCurrent now resolving correctly when baseUrl is not at the root path

--- a/hugolib/node.go

+++ b/hugolib/node.go

@@ -18,6 +18,7 @@

 	"html/template"

 	"sync"

 	"time"

+    "strings"

 )

 type Node struct {

@@ -56,8 +57,20 @@

 }

 func (n *Node) IsMenuCurrent(menuID string, inme *MenuEntry) bool {

+    s := n.Site

 	me := MenuEntry{Name: n.Title, URL: n.URL}

+

+	if strings.HasPrefix(me.URL, "/") {

+		// make it match the nodes

+		menuEntryURL := me.URL

+		menuEntryURL = helpers.URLizeAndPrep(menuEntryURL)

+		if !s.canonifyURLs {

+		    menuEntryURL = helpers.AddContextRoot(string(s.BaseURL), menuEntryURL)

+		}

+		me.URL = menuEntryURL

+	}

+

 	if !me.IsSameResource(inme) {

 		return false

 	}