Merge branch 'hotfix_v4.4.1'

hugo-next · Nov 6, 2022 · 86b9b5a · 86b9b5a
2 parents 21395a0 + 8918bff
commit 86b9b5a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.4.0
+4.4.1
diff --git a/data/config.yaml b/data/config.yaml
@@ -1,5 +1,5 @@
 # Hugo NexT theme's custom config
 
-version: 4.4.0
+version: 4.4.1
 
 domain: hugo-next.eu.org
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,8 +1,8 @@
 {{- range $k, $v := (partialCached "init.html" .) -}}
 {{- $.Scratch.Set $k $v -}}
 {{- end -}}
-{{ $commentEnable := .Params.comment.enable | default .Site.Params.comments.enable }}
-{{ .Scratch.Set "isComment" $commentEnable }}
+{{ $isComment := .Params.comment.enable | default .Site.Params.comments.enable }}
+{{ .Scratch.Set "isComment" $isComment }}
 <!DOCTYPE html>
 <html lang="{{ .Site.LanguageCode }}" data-theme="{{ .Scratch.Get "theme" }}">
 
@@ -31,7 +31,7 @@
     <div class="main-inner {{ block "main_inner_class" . }}{{ end }}">
       <!-- Submenu,Content,Comment -->
       {{- block "main" . }}{{- end }}
-      {{- if and .IsPage $commentEnable }}
+      {{- if and .IsPage $isComment }}
         {{- partialCached "comments.html" . }}
       {{- end }}
     </div>

diff --git a/layouts/partials/post/header.html b/layouts/partials/post/header.html
@@ -22,17 +22,18 @@
   {{- end }}
   {{- end }}
   {{- if $.IsHome }} </h2> {{ else }} </h1> {{ end -}}
+{{ $isComment := and (.Scratch.Get "isComment") .Site.Params.waline.comment }}
 <div class="post-meta-container">
   <div class="post-meta-items">
     {{ partial "post/header_meta/created_date.html" . }}
     {{ partial "post/header_meta/update_date.html" . }}
     {{ partial "post/header_meta/categories.html" . }}
     {{ if and $.IsHome (not (isset .Params "extlink")) }}
     <div class="post-meta-items">
-      {{ if and (eq .Site.Params.analytis.busuanzi.enable false) .Site.Params.waline.pageView }}
+      {{ if .Site.Params.waline.pageView }}
         {{ partial "post/header_meta/views.html" . }}
       {{ end }}
-      {{ if and (.Scratch.Get "isComment") .Site.Params.waline.comment }}
+      {{ if $isComment }}
         {{ partial "post/header_meta/comments.html" . }}
       {{ end }}
     </div>
@@ -43,7 +44,7 @@
     {{ partial "post/header_meta/words.html" . }}
     {{ partial "post/header_meta/readtime.html" . }}
     {{ partial "post/header_meta/views.html" . }}
-    {{ if and (.Scratch.Get "isComment") .Site.Params.waline.comment }}
+    {{ if $isComment }}
     {{ partial "post/header_meta/comments.html" . }}
     {{ end }}
   </div>