summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-12-08 09:19:17 +0100
committerAleksander Machniak <alec@alec.pl>2014-12-08 09:19:17 +0100
commitb262e129642db5a9fef0c734b81394c953cad7aa (patch)
tree233a579c9d7fe1e4e2437cda2f0ca2bd5d86b7ed /program/lib
parentf864495b7b7ab577e3aba5f06b34f92649de4a4b (diff)
Fix import of contacts with multiple email addresses from Google-csv format (#1490178)
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_csv2vcard.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
index 5f6ccd128..4b6e4fd3c 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -577,9 +577,10 @@ class rcube_csv2vcard
if ($value !== null && $value !== '') {
foreach (array($type, '*') as $_type) {
if ($data_idx = $this->gmail_label_map[$key][$item_key][$_type]) {
+ $value = explode(' ::: ', $value);
+
if (!empty($contact[$data_idx])) {
- $contact[$data_idx] = (array) $contact[$data_idx];
- $contact[$data_idx][] = $value;
+ $contact[$data_idx] = array_merge((array) $contact[$data_idx], $value);
}
else {
$contact[$data_idx] = $value;