From fa8e64327e1b3113670c40d767c0f40cc899e529 Mon Sep 17 00:00:00 2001 From: George Cushen Date: Sat, 24 Oct 2020 19:47:55 +0100 Subject: [PATCH] fix: don't require site.Params.comments Enable `comments` to be removed from `params.toml` for a site that doesn't use comments --- wowchemy/layouts/partials/comments.html | 4 +++- wowchemy/layouts/partials/page_metadata.html | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/wowchemy/layouts/partials/comments.html b/wowchemy/layouts/partials/comments.html index 53fb4978..abb31e0f 100644 --- a/wowchemy/layouts/partials/comments.html +++ b/wowchemy/layouts/partials/comments.html @@ -1,4 +1,6 @@ -{{ if site.Params.comments.engine | and (index site.Params.comments.commentable .Type) | and (ne .Params.commentable false) | or .Params.commentable }} +{{ $commentable_map := site.Params.comments.commentable | default dict }} +{{ $commentable_bool := index $commentable_map .Type | default false }} +{{ if site.Params.comments.engine | and $commentable_bool | and (ne .Params.commentable false) | or .Params.commentable }}
{{ if eq site.Params.comments.engine 1 }} {{ partial "comments/disqus.html" . }} diff --git a/wowchemy/layouts/partials/page_metadata.html b/wowchemy/layouts/partials/page_metadata.html index e6143141..cdcd5495 100644 --- a/wowchemy/layouts/partials/page_metadata.html +++ b/wowchemy/layouts/partials/page_metadata.html @@ -46,7 +46,9 @@ {{ end }} {{/* Show Disqus comment count if enabled. */}} - {{ $disqus_enabled := eq site.Params.comments.engine 1 | and (index site.Params.comments.commentable $page.Type) | and (ne $page.Params.commentable false) | or $page.Params.commentable }} + {{ $commentable_map := site.Params.comments.commentable | default dict }} + {{ $commentable_bool := index $commentable_map $page.Type | default false }} + {{ $disqus_enabled := eq site.Params.comments.engine 1 | and $commentable_bool | and (ne $page.Params.commentable false) | or $page.Params.commentable }} {{ if and $disqus_enabled (site.Params.comments.disqus.show_count | default true) }}