diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2012-06-11 18:13:12 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2012-06-11 18:13:12 +0200 |
| commit | 1d493a70e7fd967bce3cdf1a31ebe3ba1942c48f (patch) | |
| tree | d13ad067db6eb13bc0666b81f39dadf9ef2a0e5f /apps/contacts | |
| parent | 18d19b022fbda086fc4371450bbf09f45551f925 (diff) | |
| download | nextcloud-server-1d493a70e7fd967bce3cdf1a31ebe3ba1942c48f.tar.gz nextcloud-server-1d493a70e7fd967bce3cdf1a31ebe3ba1942c48f.zip | |
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
Diffstat (limited to 'apps/contacts')
| -rw-r--r-- | apps/contacts/import.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/contacts/import.php b/apps/contacts/import.php index 232de8233a9..9d5504563fd 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[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line); + $card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line)); $parts[] = implode($nl, $card); $card = array(); $inelement = false; } if ($inelement === true && trim($line) != '') { - $card[] = iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line); + $card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line)); } } //import the contacts |