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-58441 calendar: Pass $withduration to the correct function

Browse Source 
Part of MDL-55611 epic.
This commit is contained in:
Jun Pataleta 2017-03-30 11:46:33 +08:00 committed by Dan Poltawski
parent 8d63ed6ed5
commit c755cb354c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/classes/local/event/data_access/event_vault.php
View File

@ -99,13 +99,11 @@ class event_vault implements event_vault_interface {
$ignorehidden = true,
callable $filter = null
) {
global $DB;
if ($limitnum < 1 || $limitnum > 50) {
throw new limit_invalid_parameter_exception("Limit must be between 1 and 50 (inclusive)");
}
$fromquery = function($field, $timefrom, $lastseenmethod, $afterevent) {
$fromquery = function($field, $timefrom, $lastseenmethod, $afterevent, $withduration) {
if (!$timefrom) {
return false;
}
@ -114,7 +112,8 @@ class event_vault implements event_vault_interface {
$field,
$timefrom,
$afterevent ? $afterevent->get_times()->{$lastseenmethod}()->getTimestamp() : null,
$afterevent ? $afterevent->get_id() : null
$afterevent ? $afterevent->get_id() : null,
$withduration
);
};
@ -131,9 +130,9 @@ class event_vault implements event_vault_interface {
);
};
$timesortfromquery = $fromquery('timesort', $timesortfrom, 'get_sort_time', $timesortafterevent);
$timesortfromquery = $fromquery('timesort', $timesortfrom, 'get_sort_time', $timesortafterevent, $withduration);
$timesorttoquery = $toquery('timesort', $timesortto, 'get_sort_time', $timesortafterevent);
$timestartfromquery = $fromquery('timestart', $timestartfrom, 'get_start_time', $timestartafterevent);
$timestartfromquery = $fromquery('timestart', $timestartfrom, 'get_start_time', $timestartafterevent, $withduration);
$timestarttoquery = $toquery('timestart', $timestartto, 'get_start_time', $timestartafterevent);
if (($timesortto && !$timesorttoquery) || ($timestartto && !$timestarttoquery)) {
@ -168,7 +167,6 @@ class event_vault implements event_vault_interface {
"timesort ASC, id ASC",
$offset,
$limitnum,
$withduration,
$ignorehidden
))) {
foreach ($records as $record) {