From b262e129642db5a9fef0c734b81394c953cad7aa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 8 Dec 2014 09:19:17 +0100
Subject: Fix import of contacts with multiple email addresses from Google-csv
 format (#1490178)

---
 program/lib/Roundcube/rcube_csv2vcard.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'program')

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;
-- 
cgit v1.2.3