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

Merge branch 'MDL-31425-m21' of git://github.com/sammarshallou/moodle into MOODLE_21_STABLE

Browse Source
This commit is contained in:
Aparup Banerjee
2012-02-07 16:37:11 +08:00
parent e77a77bbf5 effd2830ba
commit dbc410767a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/modedit.php
+4 -6
View File
@@ -305,10 +305,9 @@ if ($mform->is_cancelled()) {
$cm->availablefrom = $fromform->availablefrom;
$cm->availableuntil = $fromform->availableuntil;
// The form time is midnight, but because we want it to be
// inclusive, set it to 23:59:59 on that day.
// inclusive, add 23:59:59 to the time (86,399 seconds).
if ($cm->availableuntil) {
$cm->availableuntil = strtotime('23:59:59',
$cm->availableuntil);
$cm->availableuntil += 86399;
}
$cm->showavailability = $fromform->showavailability;
condition_info::update_cm_from_form($cm,$fromform,true);
@@ -384,10 +383,9 @@ if ($mform->is_cancelled()) {
$newcm->availablefrom = $fromform->availablefrom;
$newcm->availableuntil = $fromform->availableuntil;
// The form time is midnight, but because we want it to be
// inclusive, set it to 23:59:59 on that day.
// inclusive, add 23:59:59 to the time (86,399 seconds).
if ($newcm->availableuntil) {
$newcm->availableuntil = strtotime('23:59:59',
$newcm->availableuntil);
$newcm->availableuntil += 86399;
}
$newcm->showavailability = $fromform->showavailability;
}