L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-54996_m32v1' of https://github.com/sbourget/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2016-12-20 09:19:27 +00:00
parent 25474b5e84 48ff43d3bd
commit b83fd5b1fe
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/lib.php
+3 -2
View File
@@ -1715,10 +1715,11 @@ function calendar_format_event_time($event, $now, $linkparams = null, $usecommon
$url = calendar_get_link_href(new moodle_url(CALENDAR_URL . 'view.php', $linkparams), 0, 0, 0, $endtime);
$eventtime = $timestart . ' <strong>&raquo;</strong> ' . html_writer::link($url, $dayend) . $timeend;
} else {
$url = calendar_get_link_href(new moodle_url(CALENDAR_URL . 'view.php', $linkparams), 0, 0, 0, $endtime);
// The event is in the future, print start and end links.
$url = calendar_get_link_href(new moodle_url(CALENDAR_URL . 'view.php', $linkparams), 0, 0, 0, $starttime);
$eventtime = html_writer::link($url, $daystart) . $timestart . ' <strong>&raquo;</strong> ';
$url = calendar_get_link_href(new moodle_url(CALENDAR_URL . 'view.php', $linkparams), 0, 0, 0, $starttime);
$url = calendar_get_link_href(new moodle_url(CALENDAR_URL . 'view.php', $linkparams), 0, 0, 0, $endtime);
$eventtime .= html_writer::link($url, $dayend) . $timeend;
}
}