From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 20:00:06 +0000 (+0200)
Subject: Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens... 
X-Git-Tag: v4.5.0beta1~74^2~421^2~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8af53829d572fd1796304a33fc3dbfe9bce84305;p=nextcloud-server.git

Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
---

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') {