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;
         }