mirror of
https://github.com/gohugoio/hugo.git
synced 2024-05-11 05:54:58 +00:00
IsMenuCurrent now resolving correctly when baseUrl is not at the root path
This commit is contained in:
@ -18,6 +18,7 @@ import (
|
||||
"html/template"
|
||||
"sync"
|
||||
"time"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Node struct {
|
||||
@ -56,8 +57,20 @@ func (n *Node) HasMenuCurrent(menuID string, inme *MenuEntry) bool {
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
Reference in New Issue
Block a user