From a37faf9c70d941168f12fd8f1685313ee552bb95 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 31 Oct 2017 08:51:46 +0800
Subject: [PATCH] MDL-60635 calendar: Fix end of month issue with previous/next
 month

This reverts to the previous way in which this was calculated.
---
 calendar/renderer.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/calendar/renderer.php b/calendar/renderer.php
index 767e83744f3..7193a970e64 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -64,15 +64,17 @@ class core_calendar_renderer extends plugin_renderer_base {
         $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 = '';