From 2c289d3a75c26c01d361bf51aeecf0859508f78a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:00:06 +0200
Subject: [PATCH] Contacts: Fix encoding errors, import errors, developer
 headache, paint cute kittens and pink clouds ;-)

---
 lib/vcard.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vcard.php b/lib/vcard.php
index 20a9e4af..168e8af3 100644
--- a/lib/vcard.php
+++ b/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') {