From 3458439ad0fc7e918dae1788aeae4d0f6121c120 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 9 Sep 2012 16:50:14 +0200
Subject: Fix encoding vCard file when contains PHOTO;ENCODING=b (#1488683)

Conflicts:

	tests/Framework/VCard.php
---
 CHANGELOG                       | 1 +
 program/include/rcube_vcard.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 1e6946b95..a29164964 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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]))
-- 
cgit v1.2.3