diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-09-09 16:50:14 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-09-09 16:52:27 +0200 |
| commit | 3458439ad0fc7e918dae1788aeae4d0f6121c120 (patch) | |
| tree | 2c05f4a5a41b9210a6cd49e2fd09dcc41b97fce9 | |
| parent | 4938a0bcfb0eb6ea89a6504c6f82afbca9c58c61 (diff) | |
Fix encoding vCard file when contains PHOTO;ENCODING=b (#1488683)
Conflicts:
tests/Framework/VCard.php
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/include/rcube_vcard.php | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix encoding vCard file when contains PHOTO;ENCODING=b (#1488683) - Fix focus issue in IE when selecting message row (#1488620) - Fix displaying all headers when they contain malformed characters (#1488666) - Fix decoding of HTML messages with UTF-16 charset specified (#1488654) diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php index c07b4042a..a6dbbf3c1 100644 --- a/program/include/rcube_vcard.php +++ b/program/include/rcube_vcard.php @@ -558,6 +558,7 @@ class rcube_vcard if ((list($key, $value) = explode('=', $attr)) && $value) { $value = trim($value); if ($key == 'ENCODING') { + $value = strtoupper($value); // add next line(s) to value string if QP line end detected if ($value == 'QUOTED-PRINTABLE') { while (preg_match('/=$/', $lines[$i])) |