Make Urls in menus respect CanonifyUrls

Fixes #519

diff --git a/hugolib/menu_test.go b/hugolib/menu_test.go
index 2336169a2a041ebcecce51e9ae68232d4cfe95f4..8a3fd04d348bff7a3a2e58338589c779953f0302 100644 (file)
--- a/hugolib/menu_test.go
+++ b/hugolib/menu_test.go
@@ -182,7 +182,7 @@ func TestHomeNodeMenu(t *testing.T) {
        defer resetMenuTestState(ts)
 
        home := ts.site.newHomeNode()
-       homeMenuEntry := &MenuEntry{Name: home.Title, Url: string(home.Permalink)}
+       homeMenuEntry := &MenuEntry{Name: home.Title, Url: home.Url}
 
        for i, this := range []struct {
                menu           string

diff --git a/hugolib/node.go b/hugolib/node.go
index be47863905d9671de27ef6ffed67fa1af94358e9..1f50e85e3fa4a701df6731d1e1b0d1526a3476bf 100644 (file)
--- a/hugolib/node.go
+++ b/hugolib/node.go
@@ -38,7 +38,7 @@ func (n *Node) Now() time.Time {
 
 func (n *Node) HasMenuCurrent(menuId string, inme *MenuEntry) bool {
        if inme.HasChildren() {
-               me := MenuEntry{Name: n.Title, Url: string(n.Permalink)}
+               me := MenuEntry{Name: n.Title, Url: n.Url}
 
                for _, child := range inme.Children {
                        if me.IsSameResource(child) {
@@ -52,8 +52,7 @@ func (n *Node) HasMenuCurrent(menuId string, inme *MenuEntry) bool {
 
 func (n *Node) IsMenuCurrent(menuId string, inme *MenuEntry) bool {
 
-       me := MenuEntry{Name: n.Title, Url: string(n.Permalink)}
-
+       me := MenuEntry{Name: n.Title, Url: n.Url}
        if !me.IsSameResource(inme) {
                return false
        }

diff --git a/hugolib/page.go b/hugolib/page.go
index 67a6842c1ad80d9db7d2eb05b9028a5624e9d19a..6e4c887a1e12250d8aff6b6363f3f72d46df08e4 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -473,7 +473,7 @@ func (page *Page) Menus() PageMenus {
        ret := PageMenus{}
 
        if ms, ok := page.Params["menu"]; ok {
-               link, _ := page.Permalink()
+               link, _ := page.RelPermalink()
 
                me := MenuEntry{Name: page.LinkTitle(), Weight: page.Weight, Url: link}
 

diff --git a/hugolib/site.go b/hugolib/site.go
index b17a19280ab9cad49f37fa27b9a76e735ee5180d..d5385081bf77289558aa9aa6a1403e18a8b2d831 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -532,10 +532,12 @@ func (s *Site) getMenusFromConfig() Menus {
                                        }
 
                                        menuEntry.MarshallMap(ime)
+
                                        if strings.HasPrefix(menuEntry.Url, "/") {
-                                               // make it absolute so it matches the nodes
-                                               menuEntry.Url = s.permalinkStr(menuEntry.Url)
+                                               // make it match the nodes
+                                               menuEntry.Url = s.prepUrl(menuEntry.Url)
                                        }
+
                                        if ret[name] == nil {
                                                ret[name] = &Menu{}
                                        }