Merge branch 'MDL-60635-master' of git://github.com/andrewnicols/moodle

moodle · Oct 31, 2017 · 73ec9b4 · 73ec9b4
2 parents 9cca2db + a37faf9
commit 73ec9b4
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/calendar/renderer.php b/calendar/renderer.php
@@ -64,15 +64,17 @@ public function fake_block_threemonths(calendar_information $calendar) {
         $time = $calendartype->timestamp_to_date_array($calendar->time);
 
         $current = $calendar->time;
+        $prevmonthyear = $calendartype->get_prev_month($time['year'], $time['mon']);
         $prev = $calendartype->convert_to_timestamp(
-                $time['year'],
-                $time['mon'] - 1,
-                $time['mday']
+                $prevmonthyear[1],
+                $prevmonthyear[0],
+                1
             );
+        $nextmonthyear = $calendartype->get_next_month($time['year'], $time['mon']);
         $next = $calendartype->convert_to_timestamp(
-                $time['year'],
-                $time['mon'] + 1,
-                $time['mday']
+                $nextmonthyear[1],
+                $nextmonthyear[0],
+                1
             );
 
         $content = '';