diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-06-11 22:00:06 +0200 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-06-11 22:15:31 +0200 |
commit | c75a7966de873a01deb542356fa145ac0716bb49 (patch) | |
tree | 71a0ce1a4d143474b8e02961a98ddca159b5aa77 /apps/contacts/lib/vcard.php | |
parent | 74eece2620412b374e6aff1103d4cbbb45936f8b (diff) | |
download | nextcloud-server-c75a7966de873a01deb542356fa145ac0716bb49.tar.gz nextcloud-server-c75a7966de873a01deb542356fa145ac0716bb49.zip |
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
Diffstat (limited to 'apps/contacts/lib/vcard.php')
-rw-r--r-- | apps/contacts/lib/vcard.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index 20a9e4afc9c..168e8af3e55 100644 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -131,7 +131,7 @@ class OC_Contacts_VCard{ foreach($property->parameters as $key=>&$parameter){ if(strtoupper($parameter->name) == 'ENCODING') { if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used? - $property->value = quoted_printable_decode($property->value); + $property->value = str_replace("\r\n", "\n", mb_convert_encoding(quoted_printable_decode($property->value), 'utf-8', 'auto')); unset($property->parameters[$key]); } } elseif(strtoupper($parameter->name) == 'CHARSET') { |