From 18c6a0bf3592e5c2a69341f3aa9d62dbfff70a6c Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sun, 26 Oct 2014 23:17:58 +0100 Subject: [PATCH] Show poll results also to non-logged in visitors --- plugins/Poll/PollPlugin.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php index 45f95b4906..636457aed4 100644 --- a/plugins/Poll/PollPlugin.php +++ b/plugins/Poll/PollPlugin.php @@ -450,18 +450,14 @@ class PollPlugin extends MicroAppPlugin // If the stored notice is a POLL_OBJECT $poll = Poll::getByNotice($stored); - if ($poll instanceof Poll and $scoped instanceof Profile) { - $response = $poll->getResponse($scoped); - if ($response instanceof Poll_response) { - // User has already responded; show the results. + if ($poll instanceof Poll) { + if (!$scoped instanceof Profile || $poll->getResponse($scoped) instanceof Poll_response) { + // Either the user is not logged in or it has already responded; show the results. $form = new PollResultForm($poll, $out); } else { $form = new PollResponseForm($poll, $out); } $form->show(); - } elseif (!$scoped instanceof Profile) { - // TRANS: No current user's profile, so we can't take a reply. - $out->text(_m('You must be logged in to respond to this poll.')); } else { // TRANS: Error text displayed if no poll data could be found. $out->text(_m('Poll data is missing')); -- 2.39.5