mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Víctor Déniz 2020-12-21 23:20:14 +00:00
commit 4d3da873b2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/classes/external/calendar_event_exporter.php vendored
View File

@ -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()) {