diff options
| author | Mario <mario@mariovavti.com> | 2022-10-11 18:41:34 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-11 18:41:34 +0000 |
| commit | 10ba98c4f5ec4efe6272516de47f0ce128ef2902 (patch) | |
| tree | fbbde69114acba764cf6b735433c53e099fd19c5 /vendor/sabre/dav/lib/DAV/StringUtil.php | |
| parent | 108a3efe0b6d37a7ed394a84c69b924ca727f17a (diff) | |
| download | volse-hubzilla-10ba98c4f5ec4efe6272516de47f0ce128ef2902.tar.gz volse-hubzilla-10ba98c4f5ec4efe6272516de47f0ce128ef2902.tar.bz2 volse-hubzilla-10ba98c4f5ec4efe6272516de47f0ce128ef2902.zip | |
Revert "update composer libs"
This reverts commit 108a3efe0b6d37a7ed394a84c69b924ca727f17a.
Diffstat (limited to 'vendor/sabre/dav/lib/DAV/StringUtil.php')
| -rw-r--r-- | vendor/sabre/dav/lib/DAV/StringUtil.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vendor/sabre/dav/lib/DAV/StringUtil.php b/vendor/sabre/dav/lib/DAV/StringUtil.php index edfb7fa5c..13a4399e3 100644 --- a/vendor/sabre/dav/lib/DAV/StringUtil.php +++ b/vendor/sabre/dav/lib/DAV/StringUtil.php @@ -77,8 +77,10 @@ class StringUtil */ public static function ensureUTF8($input) { - if (!mb_check_encoding($input, 'UTF-8') && mb_check_encoding($input, 'ISO-8859-1')) { - return mb_convert_encoding($input, 'UTF-8', 'ISO-8859-1'); + $encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1'], true); + + if ('ISO-8859-1' === $encoding) { + return utf8_encode($input); } else { return $input; } |