Merge branch 'MDL-63241-34-take2' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE

This commit is contained in:
Jun Pataleta
2018-10-09 12:48:27 +08:00
+1 -1
View File
@@ -3793,7 +3793,7 @@ function calendar_get_allowed_event_types(int $courseid = null) {
$ctxfields = context_helper::get_preload_record_columns_sql('ctx');
$sql = "SELECT
c.id, c.visible, {$ctxfields}
FROM {course}
FROM {course} c
JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextlevel)";
$params = [
'contextlevel' => CONTEXT_COURSE,