Просмотр исходного кода

Merge pull request #1129 from rob1998/v2-develop

Fix repeat until check
causefx 7 лет назад
Родитель
Сommit
62be2d26d7
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      api/functions/homepage-connect-functions.php

+ 2 - 2
api/functions/homepage-connect-functions.php

@@ -1298,8 +1298,8 @@ function getCalendar()
 							if (!calendarDaysCheck($calendarStartDiff->format('%R') . $calendarStartDiff->days, $calendarEndDiff->format('%R') . $calendarEndDiff->days)) {
 							if (!calendarDaysCheck($calendarStartDiff->format('%R') . $calendarStartDiff->days, $calendarEndDiff->format('%R') . $calendarEndDiff->days)) {
 								break;
 								break;
 							}
 							}
-							if (getCalenderRepeatUntil(trim($repeat))) {
-								$untilDate = new DateTime (getCalenderRepeatUntil(trim($repeat)));
+							if (isset($icsEvent["RRULE"]) && getCalenderRepeatUntil(trim($icsEvent["RRULE"]))) {
+								$untilDate = new DateTime (getCalenderRepeatUntil(trim($icsEvent["RRULE"])));
 								$untilDiff = date_diff($currentDate, $untilDate);
 								$untilDiff = date_diff($currentDate, $untilDate);
 								if ($untilDiff->days > 0) {
 								if ($untilDiff->days > 0) {
 									break;
 									break;