diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
commit | be4c9a9598350fb4333480f0c7b302acebcddfd4 (patch) | |
tree | fb0c2606ad4ca0bc1a710d6fdf82f55c326b3427 /vendor/sabre/vobject/lib/Parser/MimeDir.php | |
parent | f15c12376adad6534c8c0ea547a7548697eb8379 (diff) | |
parent | be852ba857f4cb8e75574a762945b50c8bddcff9 (diff) | |
download | volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.gz volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.bz2 volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.zip |
Merge branch '3.4RC'3.4
Diffstat (limited to 'vendor/sabre/vobject/lib/Parser/MimeDir.php')
-rw-r--r-- | vendor/sabre/vobject/lib/Parser/MimeDir.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vendor/sabre/vobject/lib/Parser/MimeDir.php b/vendor/sabre/vobject/lib/Parser/MimeDir.php index fa75a1a3b..78e5bf385 100644 --- a/vendor/sabre/vobject/lib/Parser/MimeDir.php +++ b/vendor/sabre/vobject/lib/Parser/MimeDir.php @@ -464,13 +464,13 @@ class MimeDir extends Parser { // vCard 2.1 allows the character set to be specified per property. $charset = (string)$propObj['CHARSET']; } - switch ($charset) { - case 'UTF-8' : + switch (strtolower($charset)) { + case 'utf-8' : break; - case 'ISO-8859-1' : + case 'iso-8859-1' : $property['value'] = utf8_encode($property['value']); break; - case 'Windows-1252' : + case 'windows-1252' : $property['value'] = mb_convert_encoding($property['value'], 'UTF-8', $charset); break; default : |