From bb1398a54e8ba45f099435f6cc56c016f8662f65 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 19 Nov 2014 02:46:43 -0500
Subject: [PATCH] Fix import of multiple contact groups from Google-csv format (#1490159)

---
 program/lib/Roundcube/rcube_csv2vcard.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
index b7d1591..802ca73 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -584,11 +584,14 @@
 
         if (!empty($contact['groups'])) {
             // categories/groups separator in vCard is ',' not ';'
+            $contact['groups'] = str_replace(',', '', $contact['groups']);
             $contact['groups'] = str_replace(';', ',', $contact['groups']);
 
-            // remove "* " added by GMail
             if (!empty($this->gmail_map)) {
+                // remove "* " added by GMail
                 $contact['groups'] = str_replace('* ', '', $contact['groups']);
+                // replace strange delimiter
+                $contact['groups'] = str_replace(' ::: ', ',', $contact['groups']);
             }
         }
 

--
Gitblit v1.9.1