Merge branch 'MDL-46671-28' of https://github.com/pjking07/moodle into MOODLE_28_STABLE

2015-01-12 13:57:10 +08:00
parent 55f84c72b4 39afb9e4b3
commit 595b56d28d
1 changed files with 6 additions and 1 deletions
@@ -180,7 +180,12 @@ class info_module extends info {
            if (is_object($cmorid)) {
                $cmorid = $cmorid->id;
            }
-            $cm = $DB->get_record('course_modules', array('id' => $cmorid), '*', MUST_EXIST);
+            $cm = $DB->get_record('course_modules', array('id' => $cmorid));
+            if (!$cm) {
+                // In some error cases, the course module may not exist.
+                debugging('info_module::is_user_visible called with invalid cmid ' . $cmorid, DEBUG_DEVELOPER);
+                return false;
+            }
        }

        // If requested, check user can access the course.