diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-03-24 17:29:46 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-03-24 17:31:22 +0100 |
| commit | 1f8fbf945526f0fdeae5e291133acf6b77f7356b (patch) | |
| tree | e42ba1deb09fd442175f74f54913f38f4f8974e4 /program/steps/addressbook | |
| parent | 73be4b529609d1a53e560891eb9c1d7954b5b1ef (diff) | |
Fix vcard folding when outputing already generated vcard
Diffstat (limited to 'program/steps/addressbook')
| -rw-r--r-- | program/steps/addressbook/export.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc index 59d5778cb..11c9ca493 100644 --- a/program/steps/addressbook/export.inc +++ b/program/steps/addressbook/export.inc @@ -73,7 +73,9 @@ header('Content-Disposition: attachment; filename="rcube_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 |