Merge branch 'MDL-70355-39' of git://github.com/lucaboesch/moodle into MOODLE_39_STABLE

2020-12-21 23:18:49 +00:00
parent e899fd5c02 fc52aaf319
commit cd94f2bc2e
1 changed files with 5 additions and 1 deletions
@@ -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()) {