From c3606bf9bab97680697ff887c96b2fc4d72fc566 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Mon, 3 Apr 2017 11:38:15 +0800
Subject: [PATCH] MDL-58463 mod_assign: Use correct course ID for fetching
 assignment's CM

---
 mod/assign/lib.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index d0543925b46..c41bb5b66a6 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -118,16 +118,10 @@ function assign_refresh_events($courseid = 0) {
         }
     }
     foreach ($assigns as $assign) {
-        // Use assignment's course column if courseid parameter is not given.
-        if (!$courseid) {
-            $courseid = $assign->course;
-            if (!$course = $DB->get_record('course', array('id' => $courseid), '*')) {
-                continue;
-            }
-        }
-        if (!$cm = get_coursemodule_from_instance('assign', $assign->id, $courseid, false)) {
-            continue;
-        }
+        // Get course and course module for the assignment.
+        list($course, $cm) = get_course_and_cm_from_instance($assign->id, 'assign', $assign->course);
+
+        // Refresh the assignment's calendar events.
         $context = context_module::instance($cm->id);
         $assignment = new assign($context, $cm, $course);
         $assignment->update_calendar($cm->id);