diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-03 10:40:29 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-08-03 10:40:29 +0000 |
| commit | 986843fc60b3e4afa39712d257e37cb804dfd59d (patch) | |
| tree | cc9cb0dc06ce851e1230572fd9b2d1586a8c2437 /roundcubemail/program/steps/addressbook | |
| parent | eaefb4114abb8d0b0fc9044952d4bb410714a451 (diff) | |
- Fix EOL character in vCard exports (#1487873)
git-svn-id: https://svn.roundcube.net/trunk@5012 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/addressbook')
| -rw-r--r-- | roundcubemail/program/steps/addressbook/export.inc | 5 |
1 files changed, 3 insertions, 2 deletions
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; } } |