Merge branch 'MDL-57777-m31' of https://github.com/micaherne/moodle into MOODLE_31_STABLE

2017-02-06 09:42:05 +01:00
parent a04076a1f2 049838f998
commit 5ef761f4d8
1 changed files with 5 additions and 1 deletions
@@ -115,7 +115,11 @@ if ($token === "$inttoken") {
 }

 // Check the context actually exists.
-list($context, $course, $cm) = get_context_info_array($contextid);
+try {
+    list($context, $course, $cm) = get_context_info_array($contextid);
+} catch (dml_missing_record_exception $e) {
+    rss_error();
+}

 $PAGE->set_context($context);