diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-18 09:59:18 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-18 10:00:27 +0200 |
| commit | dd12eec622a0508bc579e2c839439ebde7bb423b (patch) | |
| tree | a14aed205057155729ac1d86ce5b0428cdf569fc | |
| parent | 85f756737f7d90ed11d3d152fa1af2a684a951ae (diff) | |
Fix so exported vCard specifies encoding in v3-compatible format (#1489183)
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_vcard.php | 10 |
2 files changed, 10 insertions, 2 deletions
@@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== +- Fix so exported vCard specifies encoding in v3-compatible format (#1489183) + RELEASE 0.9.2 ------------- - Fix image thumbnails display in print mode (#1489134) 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 { |