Permalink
Browse files

Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skoda…

…k/moodle
  • Loading branch information...
2 parents b2851c8 + 4f500c2 commit b6d2f5b266c1393095b0a1bb91dab9de729410ac @nebgor nebgor committed Oct 31, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 enrol/manual/lib.php
View
4 enrol/manual/lib.php
@@ -209,10 +209,10 @@ public function get_manual_enrol_button(course_enrolment_manager $manager) {
$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');

0 comments on commit b6d2f5b

Please sign in to comment.