diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-11-19 08:46:43 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-11-19 08:46:43 +0100 |
| commit | bb1398a54e8ba45f099435f6cc56c016f8662f65 (patch) | |
| tree | 00695c056596c5d966c484c34f49fd03026900e4 | |
| parent | 2a89127a7cc0e2cf8c44183c487b0a2a294219d7 (diff) | |
Fix import of multiple contact groups from Google-csv format (#1490159)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_csv2vcard.php | 5 | ||||
| -rw-r--r-- | tests/src/Csv2vcard/gmail.csv | bin | 3760 -> 3778 bytes | |||
| -rw-r--r-- | tests/src/Csv2vcard/gmail.vcf | 2 |
4 files changed, 6 insertions, 2 deletions
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail =========================== - Fix drag-n-drop to folders expanded while dragging (#1490157) +- Fix import of multiple contact groups from Google-csv format (#1490159) RELEASE 1.1-beta ---------------- 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']); } } diff --git a/tests/src/Csv2vcard/gmail.csv b/tests/src/Csv2vcard/gmail.csv Binary files differindex 9f67fe9f5..1de3033e7 100644 --- a/tests/src/Csv2vcard/gmail.csv +++ b/tests/src/Csv2vcard/gmail.csv diff --git a/tests/src/Csv2vcard/gmail.vcf b/tests/src/Csv2vcard/gmail.vcf index 5337d7e63..2a56311d3 100644 --- a/tests/src/Csv2vcard/gmail.vcf +++ b/tests/src/Csv2vcard/gmail.vcf @@ -5,7 +5,7 @@ N:Lastname;Firstname;Middle;Prefix;Suffix NICKNAME:nick BDAY;VALUE=date:1975-12-12 NOTE:note"note -CATEGORIES:My Contacts +CATEGORIES:My Contacts,Test EMAIL;TYPE=INTERNET;TYPE=HOME:home@aaa.pl EMAIL;TYPE=INTERNET;TYPE=WORK:work@email.pl TEL;TYPE=pager:pager |