From: Ryan Wyllie <ryan@moodle.com>
Date: Thu, 27 Apr 2017 07:00:03 +0000 (+0000)
Subject: MDL-58557 mod_choice: only check responses if event is actionable
X-Git-Tag: v3.3.0-rc1~67
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=a0499b7fffab705838cc4884eda4d7f14b92f233

MDL-58557 mod_choice: only check responses if event is actionable
---

diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index c4149a05f46..3d16999a165 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -1205,15 +1205,15 @@ function mod_choice_core_calendar_provide_event_action(calendar_event $event,
         return null;
     }
 
-    if (choice_get_my_response($choice)) {
-        // There is no action if the user has already submitted their choice.
-        return null;
-    }
-
     // The choice is actionable if we don't have a start time or the start time is
     // in the past.
     $actionable = (!$choice->timeopen || $choice->timeopen <= $now);
 
+    if ($actionable && choice_get_my_response($choice)) {
+        // There is no action if the user has already submitted their choice.
+        return null;
+    }
+
     return $factory->create_instance(
         get_string('viewchoices', 'choice'),
         new \moodle_url('/mod/choice/view.php', array('id' => $cm->id)),