Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aeb47f1 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

reminder service patch

parent ff917fa1

Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-o 
RUN patch -u ${BASE_DIR}/apps/settings/lib/Sections/Personal/Groupware.php -i ${TMP_PATCH_DIR}/019-groupware.patch

RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch

RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch

RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-eminder-service-handle-exception.patch



RUN rm -rf ${TMP_PATCH_DIR}



# Custom theme

patches/024-eminder-service-handle-exception.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
--- ReminderService.php 2023-02-27 12:55:01.245349485 +0530

+++ ReminderService-new.php     2023-02-27 15:58:02.515774882 +0530

@@ -143,7 +143,15 @@

                                continue;

                        }



-                       $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);

+

+                       try {

+                               $vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);

+                       } catch (MaxInstancesExceededException $e) {

+                               $this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]);

+                               $this->backend->removeReminder($reminder['id']);

+                               continue;

+                       }

+

                        if (!$vevent) {

                                $this->backend->removeReminder($reminder['id']);

                                continue;