Merge pull request #4312 from nextcloud/enh/ignore-deleted-calendars

dartcafe · web-flow · commit dcda05e1e822 · 2025-09-24T19:33:00.000+02:00
Do not check deleted calendars
diff --git a/lib/Service/CalendarService.php b/lib/Service/CalendarService.php
@@ -53,6 +53,9 @@ private function getCalendarsForPrincipal(): void {
 
 		if (!empty($principalUri)) {
 			$this->calendars = $this->calendarManager->getCalendarsForPrincipal($principalUri);
+			$this->calendars = array_filter($this->calendars, function ($item) {
+				return !$item->isDeleted();
+			});
 		} else {
 			$this->calendars = [];
 		}

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ private function getCalendarsForPrincipal(): void {`
`53`	`53`
`54`	`54`	`if (!empty($principalUri)) {`
`55`	`55`	`$this->calendars = $this->calendarManager->getCalendarsForPrincipal($principalUri);`
	`56`	`+ $this->calendars = array_filter($this->calendars, function ($item) {`
	`57`	`+ return !$item->isDeleted();`
	`58`	`+ });`
`56`	`59`	`} else {`
`57`	`60`	`$this->calendars = [];`
`58`	`61`	`}`