summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps/addressbook/export.inc
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-08-03 09:20:52 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-08-03 09:20:52 +0000
commitebc3457ab218f488e2789ef0af095cd88ec0b45c (patch)
tree53fe951a117a87afbf616ebd84dc2fe19386f371 /roundcubemail/program/steps/addressbook/export.inc
parent7a3dde3ba837b8449b3f352bc20843843d7f66e2 (diff)
- Added possibility to extend rcube_vcard's fieldmap
- Skip empty values in vCard export git-svn-id: https://svn.roundcube.net/trunk@5010 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/addressbook/export.inc')
-rw-r--r--roundcubemail/program/steps/addressbook/export.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/program/steps/addressbook/export.inc b/roundcubemail/program/steps/addressbook/export.inc
index 04b98a308..f890aca69 100644
--- a/roundcubemail/program/steps/addressbook/export.inc
+++ b/roundcubemail/program/steps/addressbook/export.inc
@@ -77,7 +77,9 @@ while ($result && ($row = $result->next())) {
}
// copy values into vcard object
else {
- $vcard = new rcube_vcard($row['vcard']);
+ $vcard = new rcube_vcard();
+ $vcard->extend_fieldmap($CONTACTS->vcard_map);
+ $vcard->load($row['vcard']);
$vcard->reset();
foreach ($row as $key => $values) {