From 75403eea944fb159e13d2b2652713512d12d29a8 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Tue, 28 May 2019 18:47:55 +0200
Subject: [PATCH] * CalDAV/CardDAV: allow removing categories

---
 addressbook/inc/class.addressbook_groupdav.inc.php | 2 +-
 calendar/inc/class.calendar_ical.inc.php           | 2 +-
 infolog/inc/class.infolog_ical.inc.php             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php
index 40a189360e..254f22b448 100644
--- a/addressbook/inc/class.addressbook_groupdav.inc.php
+++ b/addressbook/inc/class.addressbook_groupdav.inc.php
@@ -628,7 +628,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
 		}
 		elseif ($contactId > 0)
 		{
-			$contact['cat_id'] = $oldContact['cat_id'];
+			$contact['cat_id'] = null;
 		}
 		if (is_array($oldContact))
 		{
diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index 61e7764f17..847101e60e 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -1343,7 +1343,7 @@ class calendar_ical extends calendar_boupdate
 				else
 				{
 					// no merge
-					if(!isset($this->supportedFields['category']) || !isset($event['category']))
+					if(!isset($this->supportedFields['category']))
 					{
 						$event['category'] = $event_info['stored_event']['category'];
 					}
diff --git a/infolog/inc/class.infolog_ical.inc.php b/infolog/inc/class.infolog_ical.inc.php
index 6cce3cf524..8b50ab690f 100644
--- a/infolog/inc/class.infolog_ical.inc.php
+++ b/infolog/inc/class.infolog_ical.inc.php
@@ -712,7 +712,7 @@ class infolog_ical extends infolog_bo
 				continue;
 			}
 
-			$taskData = array();
+			$taskData = array('info_cat' => $_taskID ? 0 : $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default']);
 
 			if ($_taskID > 0)
 			{