diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_csv2vcard.php | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -4,6 +4,7 @@ CHANGELOG Roundcube Webmail - Fix import of multiple contact email addresses from Outlook-csv format (#1490169) - Fix drag-n-drop to folders expanded while dragging (#1490157) - Fix import of multiple contact groups from Google-csv format (#1490159) +- Fix import of contacts with multiple email addresses from Google-csv format (#1490178) RELEASE 1.1-beta ---------------- 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; |