summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-18 09:59:18 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-18 10:00:27 +0200
commitdd12eec622a0508bc579e2c839439ebde7bb423b (patch)
treea14aed205057155729ac1d86ce5b0428cdf569fc /program/lib
parent85f756737f7d90ed11d3d152fa1af2a684a951ae (diff)
Fix so exported vCard specifies encoding in v3-compatible format (#1489183)
Conflicts: CHANGELOG
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_vcard.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index aded4aa78..285dc29a1 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -714,9 +714,15 @@ class rcube_vcard
$value[] = $attrvalues;
}
else if (is_bool($attrvalues)) {
- // true means just tag, not tag=value, as in PHOTO;BASE64:...
+ // true means just a tag, not tag=value, as in PHOTO;BASE64:...
if ($attrvalues) {
- $attr .= strtoupper(";$attrname");
+ // vCard v3 uses ENCODING=B (#1489183)
+ if ($attrname == 'base64') {
+ $attr .= ";ENCODING=B";
+ }
+ else {
+ $attr .= strtoupper(";$attrname");
+ }
}
}
else {