diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 8b86aed..3ba95bd 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -155,12 +155,22 @@
{{ partial "navigators/next-prev-navigator.html" . }}
-
- {{ if site.DisqusShortname }}
- {{ partial "disqus.html" . }}
-
- {{ else if site.Params.valine.enable }}
- {{ partial "valine.html" . }}
+
+
+ {{ $commentEnabled:= false }}
+ {{ if or site.Params.features.comment.enabled site.DisqusShortname }}
+ {{ $commentEnabled = true }}
+ {{ end }}
+ {{ if $commentEnabled }}
+ {{ with site.Params.features.comment }}
+
+ {{ if or .disqus.shortName site.DisqusShortname }}
+ {{ partial "disqus.html" . }}
+
+ {{ else if .valine }}
+ {{ partial "valine.html" . }}
+ {{ end }}
+ {{ end }}
{{ end }}
diff --git a/layouts/partials/valine.html b/layouts/partials/valine.html
index 716fa61..7d147e4 100644
--- a/layouts/partials/valine.html
+++ b/layouts/partials/valine.html
@@ -10,8 +10,8 @@
avatar:'{{ .Site.Params.valine.avatar }}',
placeholder: '{{ .Site.Params.valine.placeholder }}',
visitor: {{ .Site.Params.valine.visitor }},
- lang: {{ .Site.Params.valine.lang }},
- recordIP: true,
- enableQQ: true
+ lang: '{{ .Site.Params.valine.lang }}',
+ recordIP: {{ .Site.Params.valine.recordIP }},
+ enableQQ: {{ .Site.Params.valine.enableQQ }}
});
\ No newline at end of file