From d289d5bddace952120e4ecd8cd67d03c5eb1b489 Mon Sep 17 00:00:00 2001
From: Sarah Maddox <sarahmaddox@google.com>
Date: Sun, 18 Nov 2018 06:24:04 +1100
Subject: [PATCH] Ad nil checks for menus and footer links

This commit also bumps `netlify.toml` to a newer Hugo version, as variable overwrites needs Go 1.11. It can be made to work with older Hugo's, but ...

See https://github.com/gohugoio/hugo/issues/5461
---
 netlify.toml                              | 4 ++--
 themes/docsy/layouts/partials/footer.html | 8 ++++++--
 themes/docsy/layouts/partials/navbar.html | 4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index 64da137689..77b78148ef 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -3,7 +3,7 @@
   command = "hugo"
 
 [context.deploy-preview.environment]
-  HUGO_VERSION = "0.40"
+  HUGO_VERSION = "0.51"
 
 [context.production.environment]
-  HUGO_VERSION = "0.40"
+  HUGO_VERSION = "0.51"
diff --git a/themes/docsy/layouts/partials/footer.html b/themes/docsy/layouts/partials/footer.html
index 76dc9c0f0e..d9cae5e7e7 100644
--- a/themes/docsy/layouts/partials/footer.html
+++ b/themes/docsy/layouts/partials/footer.html
@@ -3,14 +3,18 @@
   <div class="container-fluid mx-sm-5">
     <div class="row">
       <div class="col-6 col-sm-4 text-xs-center order-sm-2">
-        {{ with index $links "user"}}
+        {{ with $links }}
+        {{ with index . "user"}}
         {{ template "footer-links-block"  . }}
         {{ end }}
+        {{ end }}
       </div>
       <div class="col-6 col-sm-4 text-right text-xs-center order-sm-3">
-        {{ with index $links "developer"}}
+        {{ with $links }}
+        {{ with index . "developer"}}
         {{ template "footer-links-block"  . }}
         {{ end }}
+        {{ end }}
       </div>
       <div class="col-12 col-sm-4 text-center py-2 order-sm-2">
         {{ with .Site.Params.copyright }}<small class="text-white">&copy; {{ now.Year}} {{ .}} {{ T "footer_all_rights_reserved" }}</small>{{ end }}
diff --git a/themes/docsy/layouts/partials/navbar.html b/themes/docsy/layouts/partials/navbar.html
index aed6425c89..68a5b07948 100644
--- a/themes/docsy/layouts/partials/navbar.html
+++ b/themes/docsy/layouts/partials/navbar.html
@@ -9,7 +9,9 @@
 			{{ range .Site.Menus.main }}
 			<li class="nav-item mr-4 mb-2 mb-lg-0">
 				{{ $active := or ($p.IsMenuCurrent "main" .) ($p.HasMenuCurrent "main" .) }}
-				{{ $active := or $active ( $.IsDescendant .Page)  }}
+				{{ with .Page }}
+				{{ $active = or $active ( $.IsDescendant .)  }}
+				{{ end }}
 				<a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}"><span{{if $active }} class="active"{{end}}>{{ .Name }}</span></a>
 			</li>
 			{{ end }}