summaryrefslogtreecommitdiff
path: root/program/steps/addressbook
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-08-03 10:40:29 +0000
committeralecpl <alec@alec.pl>2011-08-03 10:40:29 +0000
commit359e19a19dd45d64d14c7b29461f0fbe4f8a50bd (patch)
treed20c4712d1a509a7b436fbc11a517ec0536707af /program/steps/addressbook
parentfeaf7b5ec64528b140219ef07e64ef823f20ba9d (diff)
- Fix EOL character in vCard exports (#1487873)
Diffstat (limited to 'program/steps/addressbook')
-rw-r--r--program/steps/addressbook/export.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index f890aca69..a710aa204 100644
--- a/program/steps/addressbook/export.inc
+++ b/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;
}
}