summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/rcube_vcard.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-09-08 15:36:05 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-09-08 15:36:05 +0200
commit79367a563143272385c8666ff02dbe7ab3126f35 (patch)
treebe6e31e9cfb6321ad8222c02e94db04040078e79 /program/lib/Roundcube/rcube_vcard.php
parent9e9d62d7862bf8fddbf56ae3b0f0d9d9ac0d4c4c (diff)
Save groups membership in VCard export (#1488509)
Diffstat (limited to 'program/lib/Roundcube/rcube_vcard.php')
-rw-r--r--program/lib/Roundcube/rcube_vcard.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index a71305c4b..a85eb8873 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -47,6 +47,7 @@ class rcube_vcard
'manager' => 'X-MANAGER',
'spouse' => 'X-SPOUSE',
'edit' => 'X-AB-EDIT',
+ 'groups' => 'CATEGORIES',
);
private $typemap = array(
'IPHONE' => 'mobile',
@@ -756,7 +757,7 @@ class rcube_vcard
*
* @return string Joined and quoted string
*/
- private static function vcard_quote($s, $sep = ';')
+ public static function vcard_quote($s, $sep = ';')
{
if (is_array($s)) {
foreach($s as $part) {
@@ -765,7 +766,7 @@ class rcube_vcard
return(implode($sep, (array)$r));
}
- return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', ',' => '\,', ';' => '\;'));
+ return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', $sep => '\\'.$sep));
}
/**