Commit 4d3da873 authored by victor's avatar victor 🙇

Merge branch 'MDL-70355-master' of git://github.com/lucaboesch/moodle

parents 2a698951 94068912
......@@ -116,7 +116,11 @@ class calendar_event_exporter extends event_exporter_base {
$values['islastday'] = false;
$today = $this->related['type']->timestamp_to_date_array($this->related['today']);
$values['popupname'] = $this->event->get_name();
if ($hascourse) {
$values['popupname'] = external_format_string($this->event->get_name(), \context_course::instance($course->id), true);
} else {
$values['popupname'] = external_format_string($this->event->get_name(), \context_system::instance(), true);
}
$times = $this->event->get_times();
if ($duration = $times->get_duration()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment