From c36bb17475b3dd5925cefc32752f1fb8a63df154 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 12 Oct 2022 08:42:41 +0000 Subject: composer update sabre --- vendor/sabre/dav/lib/DAV/StringUtil.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vendor/sabre/dav/lib/DAV/StringUtil.php') 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; } -- cgit v1.2.3