mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-58087 core_calendar: Don't pass non action events through our plumbing

Browse Source 
The event factory should simply instantiate an event for non action
events and pass only action events through the plumbing.

This way modules implementing the callbacks can be sure that what
is passed in to the callback is actually supposed to be an action event.

Part of MDL-55611 epic.
This commit is contained in:
Cameron Ball 2017-03-22 19:23:05 +08:00 committed by Dan Poltawski
parent f8a3e28b16
commit 02854eac9e
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
calendar/classes/local/event/factories/event_abstract_factory.php
View File

@ -156,7 +156,7 @@ abstract class event_abstract_factory implements event_factory_interface {
function($modulename, $instance) {
return \core_calendar\api::get_module_cached(
$this->modulecachereference,
$dbrow->modulename,
$modulename,
$instance
);
}
@ -169,28 +169,28 @@ abstract class event_abstract_factory implements event_factory_interface {
});
}
return $this->expose_event(
$this->apply_component_action(
new event(
$dbrow->id,
$dbrow->name,
new event_description($dbrow->description, $dbrow->format),
$course,
$group,
$user,
new repeat_event_collection($dbrow->id, $dbrow->repeatid, $this),
$module,
$dbrow->eventtype,
new event_times(
(new \DateTimeImmutable())->setTimestamp($dbrow->timestart),
(new \DateTimeImmutable())->setTimestamp($dbrow->timestart + $dbrow->timeduration),
(new \DateTimeImmutable())->setTimestamp($dbrow->timesort ? $dbrow->timesort : $dbrow->timestart),
(new \DateTimeImmutable())->setTimestamp($dbrow->timemodified)
),
!empty($dbrow->visible),
$subscription
)
)
$event = new event(
$dbrow->id,
$dbrow->name,
new event_description($dbrow->description, $dbrow->format),
$course,
$group,
$user,
new repeat_event_collection($dbrow->id, $dbrow->repeatid, $this),
$module,
$dbrow->eventtype,
new event_times(
(new \DateTimeImmutable())->setTimestamp($dbrow->timestart),
(new \DateTimeImmutable())->setTimestamp($dbrow->timestart + $dbrow->timeduration),
(new \DateTimeImmutable())->setTimestamp($dbrow->timesort ? $dbrow->timesort : $dbrow->timestart),
(new \DateTimeImmutable())->setTimestamp($dbrow->timemodified)
),
!empty($dbrow->visible),
$subscription
);
$isactionevent = !empty($dbrow->type) && $dbrow->type == CALENDAR_EVENT_TYPE_ACTION;
return $isactionevent ? $this->expose_event($this->apply_component_action($event)) : $event;
}
}