aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-10-12 08:53:14 +0000
committerMario <mario@mariovavti.com>2022-10-12 08:53:14 +0000
commitbec76bd0577c5b131adffd8665afc73a4602bd03 (patch)
tree4ac1c6beb12e5d6b96a5373a383cb51c505cd9be /vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
parent54f4762e1ac1512c2c1106cf68833f8a7135420f (diff)
downloadvolse-hubzilla-bec76bd0577c5b131adffd8665afc73a4602bd03.tar.gz
volse-hubzilla-bec76bd0577c5b131adffd8665afc73a4602bd03.tar.bz2
volse-hubzilla-bec76bd0577c5b131adffd8665afc73a4602bd03.zip
composer update ezyang/htmlpurifier
Diffstat (limited to 'vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php')
-rw-r--r--vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
index 40a24266a..d4791cc1b 100644
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
+++ b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
@@ -398,8 +398,8 @@ class HTMLPurifier_Encoder
// characters to their true byte-wise ASCII/UTF-8 equivalents.
$str = strtr($str, self::testEncodingSupportsASCII($encoding));
return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_encode($str);
+ } elseif ($encoding === 'iso-8859-1' && function_exists('mb_convert_encoding')) {
+ $str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
return $str;
}
$bug = HTMLPurifier_Encoder::testIconvTruncateBug();
@@ -450,8 +450,8 @@ class HTMLPurifier_Encoder
// Normal stuff
$str = self::iconv('utf-8', $encoding . '//IGNORE', $str);
return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_decode($str);
+ } elseif ($encoding === 'iso-8859-1' && function_exists('mb_convert_encoding')) {
+ $str = mb_convert_encoding($str, 'ISO-8859-1', 'UTF-8');
return $str;
}
trigger_error('Encoding not supported', E_USER_ERROR);