Merge branch 'patch-1' of https://github.com/jrchamp/moodle

iFixit · Dec 22, 2014 · d61ecff · d61ecff
2 parents e04cf8d + efa2b9b
commit d61ecff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/calendar/lib.php b/calendar/lib.php
@@ -249,7 +249,7 @@ function calendar_get_mini($courses, $groups, $users, $calmonth = false, $calyea
 
     // These are used for DB queries, so we want unixtime, so we need to use Gregorian dates.
     $display->tstart = make_timestamp($gy, $gm, $gd, $gh, $gmin, 0);
-    $display->tend = $display->tstart + ($display->maxdays * DAYSECS) - 1;
+    $display->tend = strtotime("+{$display->maxdays} days", $display->tstart) - 1;
 
     // Align the starting weekday to fall in our display range
     // This is simple, not foolproof.