aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/dav/lib/DAV/StringUtil.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-10-11 18:29:06 +0000
committerMario <mario@mariovavti.com>2022-10-11 18:29:06 +0000
commitccd826f63a7a4c7e442fab8a70d9c4c84808b417 (patch)
treefbbde69114acba764cf6b735433c53e099fd19c5 /vendor/sabre/dav/lib/DAV/StringUtil.php
parent5e5f0aa955d86743a14531bed98501b59140ab1f (diff)
downloadvolse-hubzilla-ccd826f63a7a4c7e442fab8a70d9c4c84808b417.tar.gz
volse-hubzilla-ccd826f63a7a4c7e442fab8a70d9c4c84808b417.tar.bz2
volse-hubzilla-ccd826f63a7a4c7e442fab8a70d9c4c84808b417.zip
Revert "update composer libs"
This reverts commit 5e5f0aa955d86743a14531bed98501b59140ab1f.
Diffstat (limited to 'vendor/sabre/dav/lib/DAV/StringUtil.php')
-rw-r--r--vendor/sabre/dav/lib/DAV/StringUtil.php6
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;
}