extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* CardDAV/Addressbook: do NOT add empty room number as further organizational unit

Browse Source 
eg. OutlookSynchronizer adds the semicolon to the org-unit
This commit is contained in:
Ralf Becker 2020-09-11 11:47:54 +02:00
parent 56e1d3c5e5
commit fd9367d4cf
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_vcal.inc.php
View File

@ -451,6 +451,10 @@ class addressbook_vcal extends addressbook_bo
|| ($size >= 0 && !$noTruncate)) || ($size >= 0 && !$noTruncate))
{ {
$value = Api\Translation::convert(trim($value), $sysCharSet, $_charset); $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; $values[] = $value;
if ($this->version == '2.1' && preg_match('/[^\x20-\x7F]/', $value)) if ($this->version == '2.1' && preg_match('/[^\x20-\x7F]/', $value))
{ {