summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-03-24 17:29:46 +0100
committerAleksander Machniak <alec@alec.pl>2013-03-24 17:29:46 +0100
commita26c031621410f030751eae404490a10498583d7 (patch)
treee07abad474aa8a2cae2ec592ce7d0338023f6415 /program
parent3d525ffaf5b36fc74c5a9fa9ed317bcfdd32e19a (diff)
Fix vcard folding when outputing already generated vcard
Diffstat (limited to 'program')
-rw-r--r--program/steps/addressbook/export.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 15bf8b0d4..761f26b75 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -138,7 +138,9 @@ header('Content-Disposition: attachment; filename="contacts.vcf"');
while ($result && ($row = $result->next())) {
// we already have a vcard record
if ($row['vcard'] && $row['name']) {
- $row['vcard'] = preg_replace('/\r?\n/', rcube_vcard::$eol, $row['vcard']);
+ // fix folding and end-of-line chars
+ $row['vcard'] = preg_replace('/\r|\n\s+/', '', $row['vcard']);
+ $row['vcard'] = preg_replace('/\n/', rcube_vcard::$eol, $row['vcard']);
echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol;
}
// copy values into vcard object