From f38347400c19850f6a97922ea3c2a2a56f01572e Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 19 Jul 2016 12:48:52 -0400
Subject: [PATCH] FIX: `currentUser` can be null

---
 .../poll/assets/javascripts/lib/discourse-markdown/poll.js.es6 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6 b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
index 927aa5cc5..7458f2aa9 100644
--- a/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
+++ b/plugins/poll/assets/javascripts/lib/discourse-markdown/poll.js.es6
@@ -8,8 +8,9 @@ const ATTRIBUTES_REGEX = new RegExp("(" + WHITELISTED_ATTRIBUTES.join("|") + ")=
 
 registerOption((siteSettings, opts) => {
   const currentUser = (opts.getCurrentUser && opts.getCurrentUser(opts.userId)) || opts.currentUser;
+  const staff = currentUser && currentUser.staff;
 
-  opts.features.poll = !!siteSettings.poll_enabled || currentUser.staff;
+  opts.features.poll = !!siteSettings.poll_enabled || staff;
   opts.pollMaximumOptions = siteSettings.poll_maximum_options;
 });