Merge branch 'MDL-61249-master' of git://github.com/sarjona/moodle

2018-02-26 23:10:14 +01:00
parent b62139ab27 e2cd8d3c6d
commit e7d8d22dca
1 changed files with 2 additions and 2 deletions
@@ -91,7 +91,7 @@ switch ($action) {
        }

        $roleid = optional_param('roletoassign', null, PARAM_INT);
-        $duration = optional_param('duration', 0, PARAM_FLOAT);
+        $duration = optional_param('duration', 0, PARAM_INT);
        $startdate = optional_param('startdate', 0, PARAM_INT);
        $recovergrades = optional_param('recovergrades', 0, PARAM_INT);

@@ -125,7 +125,7 @@ switch ($action) {
        if ($duration <= 0) {
            $timeend = 0;
        } else {
-            $timeend = $timestart + intval($duration*24*60*60);
+            $timeend = $timestart + $duration;
        }

        $instances = $manager->get_enrolment_instances();