diff options
author | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-03-23 21:44:55 -0700 |
commit | a8d81a68d62e982094110a340341756fbb6df4a9 (patch) | |
tree | 51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /vendor/sabre/vobject/lib/Parser | |
parent | abe6ab477531916158c04e3d387cb02e839d28b6 (diff) | |
parent | 09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff) | |
download | volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2 volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'vendor/sabre/vobject/lib/Parser')
-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 : |