MDL-9729 Ensure start of week day calculation observes user timezone setting in the...

diff --git a/calendar/view.php b/calendar/view.php
index 8fe19f658b59f1aa0c2c3b780990680bb4b703d6..5ec03b5c569f98227c1bdb2e9997bc2757a43feb 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -328,18 +328,19 @@ 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);
 
+    $startwday = 0;
     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
+        $startwday = gmdate('w', $display->tstart); // $display->tstart is already GMT, so don't use date(): messes with server's TZ
     } 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 = date('w', $display->tstart); // $display->tstart not necessarily GMT, so use date()
     }
 
-    $startwday = gmdate('w', $display->tstart); // $display->tstart is already GMT, so don't use date(): messes with server's TZ
-
     // Align the starting weekday to fall in our display range
     if($startwday < $display->minwday) {
         $startwday += 7;