Allow page.HasMenuCurrent() and node.HasMenuCurrent() to proceed with multi-level...

Currently HasMenuCurrent only process the first 2 levels.

diff --git a/hugolib/node.go b/hugolib/node.go
index 1732cac161751e80e99e91e90877d352f86c0c3e..ecf5e32fa2dd5ab171e4774e49ec935bad096bd6 100644 (file)
--- a/hugolib/node.go
+++ b/hugolib/node.go
@@ -14,10 +14,11 @@
 package hugolib
 
 import (
-       "github.com/spf13/hugo/helpers"
        "html/template"
        "sync"
        "time"
+
+       "github.com/spf13/hugo/helpers"
 )
 
 type Node struct {
@@ -51,6 +52,9 @@ func (n *Node) HasMenuCurrent(menuID string, inme *MenuEntry) bool {
                        if me.IsSameResource(child) {
                                return true
                        }
+                       if n.HasMenuCurrent(menuID, child) {
+                               return true
+                       }
                }
        }
 

diff --git a/hugolib/page.go b/hugolib/page.go
index 96de471546686f02f226c8b4978e1fe7f5383ffc..2bd19e13e80fd58db929db661934730595fdb841 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -626,6 +626,9 @@ func (p *Page) HasMenuCurrent(menu string, me *MenuEntry) bool {
                                if child.IsEqual(m) {
                                        return true
                                }
+                               if p.HasMenuCurrent(menu, child) {
+                                       return true
+                               }
                        }
                }
        }