summaryrefslogtreecommitdiffstats
path: root/apps/contacts/lib/vcard.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2012-04-29 22:10:16 +0200
committerThomas Tanghus <thomas@tanghus.net>2012-04-29 22:12:27 +0200
commitf6fefe9a36b83466bf551065296d8ff56e7ecbb2 (patch)
tree335facdc1b71e18628c86cf8059a56f9ba5d40c8 /apps/contacts/lib/vcard.php
parent023479b1e2a8f33e7d540bd77dc7d1070f9554f8 (diff)
downloadnextcloud-server-f6fefe9a36b83466bf551065296d8ff56e7ecbb2.tar.gz
nextcloud-server-f6fefe9a36b83466bf551065296d8ff56e7ecbb2.zip
Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI.
Remove an obsolute file and did some cleanup.
Diffstat (limited to 'apps/contacts/lib/vcard.php')
-rw-r--r--apps/contacts/lib/vcard.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 96fc8cf7121..d8cce36b80b 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -493,7 +493,7 @@ class OC_Contacts_VCard{
}
// NOTE: Apparently Sabre_VObject_Reader can't always deal with value list parameters
// like TYPE=HOME,CELL,VOICE. Tanghus.
- if ($property->name == 'TEL' && $parameter->name == 'TYPE'){
+ if (in_array($property->name, array('TEL', 'EMAIL')) && $parameter->name == 'TYPE'){
if (isset($temp['parameters'][$parameter->name])){
$temp['parameters'][$parameter->name][] = $parameter->value;
}