From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 5 Apr 2020 18:57:26 +0000 (+0200)
Subject: Only delete the default calendar setting when the default calendar
X-Git-Tag: v19.0.0beta3~23^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F19852%2Fhead;p=nextcloud-server.git

Only delete the default calendar setting when the default calendar
itself is deleted

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---

diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php
index c22afa755cb..d5e3358d96d 100644
--- a/apps/dav/lib/AppInfo/Application.php
+++ b/apps/dav/lib/AppInfo/Application.php
@@ -255,7 +255,10 @@ class Application extends App {
 			$principalUri = $event->getArgument('calendarData')['principaluri'];
 			if (strpos($principalUri, 'principals/users') === 0) {
 				list(, $UID) = \Sabre\Uri\split($principalUri);
-				$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
+				$uri = $event->getArgument('calendarData')['uri'];
+				if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
+					$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
+				}
 			}
 		});
 	}