diff --git a/layouts/partials/dependencies.html b/layouts/partials/dependencies.html index bede3d732f..f5495dec0e 100644 --- a/layouts/partials/dependencies.html +++ b/layouts/partials/dependencies.html @@ -3,8 +3,8 @@ {{- $outputFormat := .outputFormat | default (partial "output-format.hugo" $page) }} {{- range $k, $v := $page.Site.Params.relearn.dependencies }} {{- $has := printf "has%s" $v.name }} - {{- $nestedhas := printf "nestedHas%s" $v.name }} - {{- $wants := or ($page.Page.Store.Get $has) (and ($page.Page.Store.Get (printf "%sIsNested" $outputFormat)) ($page.Page.Store.Get $nestedhas)) }} + {{- $hasnested := printf "relearnHasNested%s" $v.name }} + {{- $wants := or ($page.Page.Store.Get $has) (and ($page.Page.Store.Get "relearnIsNested") ($page.Page.Store.Get $hasnested)) }} {{- if and $wants }} {{- if $v.location }} {{- warnf "DEPRECATED parameter 'location' for dependency '%s' configured in your hugo.toml, query the 'location' parameter inside your dependency loader instead; see https://mcshelby.github.io/hugo-theme-relearn/basics/migration#5270" $k}} diff --git a/layouts/partials/nested-article.hugo b/layouts/partials/nested-article.hugo index 16270724bc..c3d25d6855 100644 --- a/layouts/partials/nested-article.hugo +++ b/layouts/partials/nested-article.hugo @@ -1,6 +1,6 @@ {{- $page := .page }} {{- $outputFormat := .outputFormat }} -{{- $page.Page.Store.Set (printf "%sIsNested" $outputFormat) true }} +{{- $page.Page.Store.Set "relearnIsNested" true }} {{- with $page }} {{- $currentNode := . }} {{- $pages := partial "pageHelper/pagesBy.html" (dict "page" .) }} @@ -50,8 +50,8 @@ {{- partialCached "nested-content.hugo" (dict "page" $page "outputFormat" $outputFormat) $page.RelPermalink "outputFormat" $outputFormat }} {{- range $page.Site.Params.relearn.dependencies }} {{- $has := printf "has%s" .name }} - {{- $nestedhas := printf "nestedHas%s" .name }} - {{- $currentNode.Page.Store.Set $nestedhas (or ($currentNode.Page.Store.Get $nestedhas) ($page.Page.Store.Get $has)) }} + {{- $hasnested := printf "relearnHasNested%s" .name }} + {{- $currentNode.Page.Store.Set $hasnested (or ($currentNode.Page.Store.Get $hasnested) ($page.Page.Store.Get $has)) }} {{- end }} {{- end }} {{- end }} diff --git a/layouts/partials/single-article.hugo b/layouts/partials/single-article.hugo index 1e76d4bba8..5a88c2a124 100644 --- a/layouts/partials/single-article.hugo +++ b/layouts/partials/single-article.hugo @@ -1,5 +1,5 @@ {{- $page := .page }} {{- $content := .content }} {{- $outputFormat := .outputFormat }} -{{- $page.Page.Store.Set (printf "%sIsNested" $outputFormat) false }} +{{- $page.Page.Store.Set "relearnIsNested" false }} {{- partial "output-partial.hugo" (dict "base" "article" "page" $page "parameter" (dict "page" $page "content" $content "outputFormat" $outputFormat) "outputFormat" $outputFormat) }} \ No newline at end of file