mirror of
https://github.com/moodle/moodle.git
synced 2025-04-14 04:52:36 +02:00
Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle
This commit is contained in:
commit
b6d2f5b266
@ -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');
|
||||
|
Loading…
x
Reference in New Issue
Block a user