summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-01-11 15:14:18 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-01-11 15:14:18 +0100
commita3e341cb2919f298caade93c9698c6b4fd9de6c4 (patch)
tree0151f631e7f2290eb7367724c3180e91ea5ac82f /program/lib
parent7cc1d3ae170b63c5f477db4eda09b94ab42d1bb5 (diff)
parent536d45d3a218a86e4d9dd5ad83fa295c145eab6f (diff)
Merge branch 'release-0.9' of github.com:roundcube/roundcubemail into release-0.9
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_csv2vcard.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
index e8202c6d4..0d3276b84 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -124,6 +124,12 @@ class rcube_csv2vcard
//'work_address_2' => '',
'work_country' => 'country:work',
'work_zipcode' => 'zipcode:work',
+ 'last' => 'surname',
+ 'first' => 'firstname',
+ 'work_city' => 'locality:work',
+ 'work_state' => 'region:work',
+ 'home_city_short' => 'locality:home',
+ 'home_state_short' => 'region:home',
);
/**