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

…k/moodle
nilo72 · Oct 31, 2011 · b6d2f5b · b6d2f5b
2 parents b2851c8 + 4f500c2
commit b6d2f5b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/enrol/manual/lib.php b/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');