From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 20:05:15 +0000 (+0200)
Subject: Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49... 
X-Git-Tag: v4.5.0beta1~74^2~421^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c75f9f9397a3b21a5165a4f2632882fdc1d894c3;p=nextcloud-server.git

Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
---

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index 9d5504563fd..0ee35f9fd81 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -63,13 +63,13 @@ foreach($lines as $line){
 	if(strtoupper(trim($line)) == 'BEGIN:VCARD'){
 		$inelement = true;
 	} elseif (strtoupper(trim($line)) == 'END:VCARD') {
-		$card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
+		$card[] = $line;
 		$parts[] = implode($nl, $card);
 		$card = array();
 		$inelement = false;
 	}
 	if ($inelement === true && trim($line) != '') {
-		$card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line));
+		$card[] = $line;
 	}
 }
 //import the contacts