Skip to content
Browse files

Merging from MOODLE_16_STABLE:

Bugfix: skodak's fix for MDL-5991 is needed here as well.
  • Loading branch information...
1 parent 7a201b2 commit 8e74a6eb9ee3fb263bee00d21ef440a9f2fa544f defacer committed
Showing with 9 additions and 3 deletions.
  1. +9 −3 calendar/view.php
View
12 calendar/view.php
@@ -325,9 +325,15 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
list($d, $m, $y) = array($date['mday'], $date['mon'], $date['year']); // This is what we want to display
$display->maxdays = calendar_days_in_month($m, $y);
- // We 'll keep these values as GMT here, and offset them when the time comes to query the db
- $display->tstart = gmmktime(0, 0, 0, $m, 1, $y); // This is GMT
- $display->tend = gmmktime(23, 59, 59, $m, $display->maxdays, $y); // GMT
+ if (get_user_timezone_offset() < 99) {
+ // We 'll keep these values as GMT here, and offset them when the time comes to query the db
+ $display->tstart = gmmktime(0, 0, 0, $m, 1, $y); // This is GMT
+ $display->tend = gmmktime(23, 59, 59, $m, $display->maxdays, $y); // GMT
+ } else {
+ // no timezone info specified
+ $display->tstart = mktime(0, 0, 0, $m, 1, $y);
+ $display->tend = mktime(23, 59, 59, $m, $display->maxdays, $y);
+ }
$startwday = gmdate('w', $display->tstart); // $display->tstart is already GMT, so don't use date(): messes with server's TZ

0 comments on commit 8e74a6e

Please sign in to comment.
Something went wrong with that request. Please try again.