From fd9367d4cf8b58517caa64b0e6489cc1c7708361 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 11 Sep 2020 11:47:54 +0200 Subject: [PATCH] * CardDAV/Addressbook: do NOT add empty room number as further organizational unit eg. OutlookSynchronizer adds the semicolon to the org-unit --- addressbook/inc/class.addressbook_vcal.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addressbook/inc/class.addressbook_vcal.inc.php b/addressbook/inc/class.addressbook_vcal.inc.php index 24dac95dba..f6bbad21d3 100644 --- a/addressbook/inc/class.addressbook_vcal.inc.php +++ b/addressbook/inc/class.addressbook_vcal.inc.php @@ -451,6 +451,10 @@ class addressbook_vcal extends addressbook_bo || ($size >= 0 && !$noTruncate)) { $value = Api\Translation::convert(trim($value), $sysCharSet, $_charset); + + // do NOT add empty room number as further organizational unit, eg. OutlookSynchronizer add's the semicolon to the org-unit + if (empty($value) && in_array($databaseField, ['room'])) continue 2; + $values[] = $value; if ($this->version == '2.1' && preg_match('/[^\x20-\x7F]/', $value)) {