diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-19 19:52:33 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-19 19:52:33 +0200 |
| commit | 3bbe4e7424f12b4f870fb775b8230714a2862380 (patch) | |
| tree | 925ee90ecc269ed5fad0426efed4e741ca3f3cd7 /program/lib/Roundcube/rcube_vcard.php | |
| parent | cd9e4154060ff38226e77eea82123519322b2327 (diff) | |
| parent | b200258d5af08ff24065d58c96d8ccf834d1ffad (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube/rcube_vcard.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_vcard.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php index 90acb2110..a71305c4b 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 { |