summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-11-19 08:46:43 +0100
committerAleksander Machniak <alec@alec.pl>2014-11-19 08:46:43 +0100
commitbb1398a54e8ba45f099435f6cc56c016f8662f65 (patch)
tree00695c056596c5d966c484c34f49fd03026900e4 /program/lib/Roundcube
parent2a89127a7cc0e2cf8c44183c487b0a2a294219d7 (diff)
Fix import of multiple contact groups from Google-csv format (#1490159)
Diffstat (limited to 'program/lib/Roundcube')
-rw-r--r--program/lib/Roundcube/rcube_csv2vcard.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
index b7d159178..802ca730d 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -584,11 +584,14 @@ class rcube_csv2vcard
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']);
}
}