moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 03:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-43373-master' of https://github.com/tonyjbutler/moodle

Browse source
This commit is contained in:
Dan Poltawski 2014-01-07 10:43:39 +08:00
commit ce3dbebc91
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
enrol/locallib.php
View file

@ -1058,7 +1058,7 @@ class course_enrolment_manager {
continue; continue;
} else if ($ue->timestart and $ue->timeend) { } else if ($ue->timestart and $ue->timeend) {
$period = get_string('periodstartend', 'enrol', array('start'=>userdate($ue->timestart), 'end'=>userdate($ue->timeend))); $period = get_string('periodstartend', 'enrol', array('start'=>userdate($ue->timestart), 'end'=>userdate($ue->timeend)));
$periodoutside = ($ue->timestart && $ue->timeend && $now < $ue->timestart && $now > $ue->timeend); $periodoutside = ($ue->timestart && $ue->timeend && ($now < $ue->timestart || $now > $ue->timeend));
} else if ($ue->timestart) { } else if ($ue->timestart) {
$period = get_string('periodstart', 'enrol', userdate($ue->timestart)); $period = get_string('periodstart', 'enrol', userdate($ue->timestart));
$periodoutside = ($ue->timestart && $now < $ue->timestart); $periodoutside = ($ue->timestart && $now < $ue->timestart);