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

robjoyce · Dec 21, 2020 · 4d3da87 · 4d3da87
2 parents 2a69895 + 9406891
commit 4d3da87
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/calendar/classes/external/calendar_event_exporter.php b/calendar/classes/external/calendar_event_exporter.php
@@ -116,7 +116,11 @@ protected function get_other_values(renderer_base $output) {
         $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()) {