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:14:21 +0200 |
| commit | 8af53829d572fd1796304a33fc3dbfe9bce84305 (patch) | |
| tree | fbe3bd5ceab519bada0fb0fd94ea697cce43c110 /apps/contacts/lib | |
| parent | 759ddcbf32d4b6b9149b9c03259408933448c129 (diff) | |
| download | nextcloud-server-8af53829d572fd1796304a33fc3dbfe9bce84305.tar.gz nextcloud-server-8af53829d572fd1796304a33fc3dbfe9bce84305.zip | |
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
Diffstat (limited to 'apps/contacts/lib')
| -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') { |