hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit 2b91b480d01cfcd4b13922effb25d83bc5dd3fb2
parent b4871787f02d6660da8bc82b951178dc3964d9a9
Author: Danny Sung <danny@dannysung.com>
Date:   Mon, 30 Mar 2015 22:44:08 -0700

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

Diffstat:
Mhugolib/node.go | 13+++++++++++++
1 file changed, 13 insertions(+), 0 deletions(-)
diff --git 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
 	}