Merge branch 'MDL-30157_master-fix' of git://github.com/dmonllao/moodle

rudivdme · Sep 17, 2015 · 22e97e6 · 22e97e6
2 parents 8c55a50 + ba523bf
commit 22e97e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/enrol/manual/ajax.php b/enrol/manual/ajax.php
@@ -140,7 +140,9 @@
                 $timestart = $course->startdate;
                 break;
             case 4:
-                $timestart = time();
+                // We mimic get_enrolled_sql round(time(), -2) but always floor as we want users to always access their
+                // courses once they are enrolled.
+                $timestart = intval(substr(time(), 0, 8) . '00') - 1;
                 break;
             case 3:
             default:

diff --git a/enrol/manual/manage.php b/enrol/manual/manage.php
@@ -119,7 +119,9 @@
                     $timestart = $course->startdate;
                     break;
                 case 4:
-                    $timestart = $now;
+                    // We mimic get_enrolled_sql round(time(), -2) but always floor as we want users to always access their
+                    // courses once they are enrolled.
+                    $timestart = intval(substr($now, 0, 8) . '00') - 1;
                     break;
                 case 3:
                 default: