Merge branch 'MDL-60176-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
David Monllao 2017-10-16 20:02:03 +02:00
commit 7152d2ff7a

View File

@ -198,12 +198,11 @@ class calendar_event_exporter extends event_exporter_base {
* @return string
*/
public function get_calendar_event_type() {
$type = $this->event->get_type();
if ($type == 'open' || $type == 'close') {
$type = 'course';
if ($this->event->get_course_module()) {
return 'course';
}
return $type;
return $this->event->get_type();
}
/**