From 986843fc60b3e4afa39712d257e37cb804dfd59d Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 3 Aug 2011 10:40:29 +0000 Subject: - Fix EOL character in vCard exports (#1487873) git-svn-id: https://svn.roundcube.net/trunk@5012 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/addressbook/export.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/steps') diff --git a/roundcubemail/program/steps/addressbook/export.inc b/roundcubemail/program/steps/addressbook/export.inc index f890aca69..a710aa204 100644 --- a/roundcubemail/program/steps/addressbook/export.inc +++ b/roundcubemail/program/steps/addressbook/export.inc @@ -73,7 +73,8 @@ header('Content-Disposition: attachment; filename="rcube_contacts.vcf"'); while ($result && ($row = $result->next())) { // we already have a vcard record if ($row['vcard'] && $row['name']) { - echo rcube_vcard::rfc2425_fold($row['vcard']) . "\n"; + $row['vcard'] = preg_replace('/\r?\n/', rcube_vcard::$eol, $row['vcard']); + echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol; } // copy values into vcard object else { @@ -90,7 +91,7 @@ while ($result && ($row = $result->next())) { } } - echo $vcard->export(true) . "\n"; + echo $vcard->export(true) . rcube_vcard::$eol; } } -- cgit v1.2.3