From 26c743a962e3eaf849a4671341a057b7005efaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 14 Sep 2015 20:11:03 +0200
Subject: [PATCH] FIX: disable poll dialect when poll plugin is disabled

---
 plugins/poll/assets/javascripts/poll_dialect.js | 3 +++
 plugins/poll/config/settings.yml                | 1 +
 2 files changed, 4 insertions(+)

diff --git a/plugins/poll/assets/javascripts/poll_dialect.js b/plugins/poll/assets/javascripts/poll_dialect.js
index 70771e41568..bc9b6585ede 100644
--- a/plugins/poll/assets/javascripts/poll_dialect.js
+++ b/plugins/poll/assets/javascripts/poll_dialect.js
@@ -36,6 +36,9 @@
         }
       }
 
+      // Disable dialect when poll plugin is disabled
+      if (!Discourse.SiteSettings.poll_enabled) { return ["div"].concat(contents); }
+
       // default poll attributes
       var attributes = { "class": "poll" };
       attributes[DATA_PREFIX + "status"] = "open";
diff --git a/plugins/poll/config/settings.yml b/plugins/poll/config/settings.yml
index f75945a5d67..2d01ba6b884 100644
--- a/plugins/poll/config/settings.yml
+++ b/plugins/poll/config/settings.yml
@@ -1,6 +1,7 @@
 plugins:
   poll_enabled:
     default: true
+    client: true
   poll_maximum_options:
     default: 20
     client: true