diff options
| author | Mario <mario@mariovavti.com> | 2022-10-26 21:56:32 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-26 21:56:32 +0000 |
| commit | 95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d (patch) | |
| tree | 582116e7571ae7eaa4a51578b2f5ebeae31f75a9 /vendor/sabre/dav/lib/DAV/StringUtil.php | |
| parent | ef2448e17e742e7dcef458993bce1e0a29756aa7 (diff) | |
| parent | 9554f535199b5fb3a23dd40f9921a15339da3bd7 (diff) | |
| download | volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.tar.gz volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.tar.bz2 volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.zip | |
Merge branch 'dev'
Diffstat (limited to 'vendor/sabre/dav/lib/DAV/StringUtil.php')
| -rw-r--r-- | vendor/sabre/dav/lib/DAV/StringUtil.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vendor/sabre/dav/lib/DAV/StringUtil.php b/vendor/sabre/dav/lib/DAV/StringUtil.php index 13a4399e3..edfb7fa5c 100644 --- a/vendor/sabre/dav/lib/DAV/StringUtil.php +++ b/vendor/sabre/dav/lib/DAV/StringUtil.php @@ -77,10 +77,8 @@ class StringUtil */ public static function ensureUTF8($input) { - $encoding = mb_detect_encoding($input, ['UTF-8', 'ISO-8859-1'], true); - - if ('ISO-8859-1' === $encoding) { - return utf8_encode($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'); } else { return $input; } |