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

diff --git a/hugolib/node.go b/hugolib/node.go
index e7105594712eecffb7587644bc55ea3c26654892..d98cfcb8b60b5e1d2ed0992f99fc1171346e9bb5 100644 (file)
--- a/hugolib/node.go
+++ b/hugolib/node.go
@@ -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
        }