diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-04-17 10:39:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 10:39:19 +0200 |
| commit | 7c4b7e9329045a132d1fe2a3bdb943542d47662a (patch) | |
| tree | a231e84cddbbf3c64996965ca146f6481c0b7a1d /apps/dav/lib | |
| parent | 2a51a320cef251de3ee291921366824ad8103516 (diff) | |
| parent | 29541322c1ce6eed2d43a93172fafcf22c0c54ff (diff) | |
| download | nextcloud-server-7c4b7e9329045a132d1fe2a3bdb943542d47662a.tar.gz nextcloud-server-7c4b7e9329045a132d1fe2a3bdb943542d47662a.zip | |
Merge pull request #20529 from nextcloud/fix/Card-multiple
Update list of multiple properties
Diffstat (limited to 'apps/dav/lib')
| -rw-r--r-- | apps/dav/lib/CardDAV/AddressBookImpl.php | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php index c63955202f4..5e355611c11 100644 --- a/apps/dav/lib/CardDAV/AddressBookImpl.php +++ b/apps/dav/lib/CardDAV/AddressBookImpl.php @@ -240,6 +240,7 @@ class AddressBookImpl implements IAddressBook { * * @param string $uri * @param VCard $vCard + * @param boolean $withTypes (optional) return the values as arrays of value/type pairs * @return array */ protected function vCard2Array($uri, VCard $vCard, $withTypes = false) { @@ -259,19 +260,7 @@ class AddressBookImpl implements IAddressBook { ]) . '?photo'; $result['PHOTO'] = 'VALUE=uri:' . $url; - } elseif ($property->name === 'X-SOCIALPROFILE') { - $type = $this->getTypeFromProperty($property); - - // Type is the social network, when it's empty we don't need this. - if ($type !== null) { - if (!isset($result[$property->name])) { - $result[$property->name] = []; - } - $result[$property->name][$type] = $property->getValue(); - } - - // The following properties can be set multiple times - } elseif (in_array($property->name, ['CLOUD', 'EMAIL', 'IMPP', 'TEL', 'URL', 'X-ADDRESSBOOKSERVER-MEMBER'])) { + } elseif (in_array($property->name, ['URL', 'GEO', 'CLOUD', 'ADR', 'EMAIL', 'IMPP', 'TEL', 'X-SOCIALPROFILE', 'RELATED', 'LANG', 'X-ADDRESSBOOKSERVER-MEMBER'])) { if (!isset($result[$property->name])) { $result[$property->name] = []; } |