Fix #2588 — don’t show nikolademo warning if no comments are enabled

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Dec 9, 2016 · 52685b5 · 52685b5
1 parent 2038779
commit 52685b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,8 @@ New in master
 Bugfixes
 --------
 
+* Don’t warn about ``nikolademo`` DISQUS account when comments are
+  disabled (Issue #2588)
 * Make ``data`` from global context available to templated shortcodes
   as ``global_data`` (Issue #2488)
 * Don't crash if plugins is a file (Issue #2539)

diff --git a/nikola/plugins/command/deploy.py b/nikola/plugins/command/deploy.py
@@ -79,7 +79,7 @@ def _execute(self, command, args):
             last_deploy = dateutil.parser.parse(last_deploy)
             clean = False
 
-        if self.site.config['COMMENT_SYSTEM_ID'] == 'nikolademo':
+        if self.site.config['COMMENT_SYSTEM'] and self.site.config['COMMENT_SYSTEM_ID'] == 'nikolademo':
             self.logger.warn("\nWARNING WARNING WARNING WARNING\n"
                              "You are deploying using the nikolademo Disqus account.\n"
                              "That means you will not be able to moderate the comments in your own site.\n"