summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-01-07 19:52:05 +0100
committerAleksander Machniak <alec@alec.pl>2013-01-07 19:52:05 +0100
commit987b7aea59cb6434c7e4546796d070a6edc89f78 (patch)
tree02652d1a1041f9194073dd6862e4282f3fc730a2 /program/lib
parent6c7ac2ef4b6e9482fd47b290dd9b07e5f8a0bd54 (diff)
parentacf851f823fba5354c2227e48c3097a524312268 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_csv2vcard.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
index f94a7aac7..e8202c6d4 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -390,6 +390,15 @@ class rcube_csv2vcard
}
}
+ // Convert address(es) to rcube_vcard data
+ foreach ($contact as $idx => $value) {
+ $name = explode(':', $idx);
+ if (in_array($name[0], array('street', 'locality', 'region', 'zipcode', 'country'))) {
+ $contact['address:'.$name[1]][$name[0]] = $value;
+ unset($contact[$idx]);
+ }
+ }
+
// Create vcard object
$vcard = new rcube_vcard();
foreach ($contact as $name => $value) {