From f6fefe9a36b83466bf551065296d8ff56e7ecbb2 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Sun, 29 Apr 2012 22:10:16 +0200 Subject: 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. --- apps/contacts/lib/vcard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/contacts/lib/vcard.php') 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; } -- cgit v1.2.3