Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle

This commit is contained in:
Aparup Banerjee 2011-10-31 15:25:55 +08:00
commit b6d2f5b266

View File

@ -209,10 +209,10 @@ class enrol_manual_plugin extends enrol_plugin {
$startdateoptions = array();
$timeformat = get_string('strftimedatefullshort');
if ($startdate > 0) {
$today = time();
$today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);
$startdateoptions[2] = get_string('coursestart') . ' (' . userdate($startdate, $timeformat) . ')';
}
$today = time();
$today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);
$startdateoptions[3] = get_string('today') . ' (' . userdate($today, $timeformat) . ')' ;
$modules = array('moodle-enrol_manual-quickenrolment', 'moodle-enrol_manual-quickenrolment-skin');