aboutsummaryrefslogtreecommitdiffstats
path: root/include/oembed.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2024-01-14 17:23:57 +0000
committerMario <mario@mariovavti.com>2024-01-14 17:23:57 +0000
commitb05b756148e1a1f24deaadcb0a021e77839bba43 (patch)
treebc03f94f461eb6e10cfca059186030ff08655220 /include/oembed.php
parent03819abb22cd8f3c72eaa2b39f424249434f392a (diff)
downloadvolse-hubzilla-b05b756148e1a1f24deaadcb0a021e77839bba43.tar.gz
volse-hubzilla-b05b756148e1a1f24deaadcb0a021e77839bba43.tar.bz2
volse-hubzilla-b05b756148e1a1f24deaadcb0a021e77839bba43.zip
Handling HTML entities via mbstring is deprecated
Diffstat (limited to 'include/oembed.php')
-rw-r--r--include/oembed.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/include/oembed.php b/include/oembed.php
index fbe6a573b..a90c91641 100644
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -395,7 +395,11 @@ function oembed_format_object($j){
$ret .= "<br /><a href='$embedurl' rel='oembed'>$embedurl</a>";
}
$ret.="<br style='clear:left'></span>";
- return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
+
+ // mb_convert_encoding() is deprecated
+ // return mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));
+ return mb_encode_numericentity($ret, [0x80, 0x10FFFF, 0, ~0], 'UTF-8');
+
}
function oembed_iframe($src,$width,$height) {
@@ -456,7 +460,10 @@ function oembed_html2bbcode($text) {
if (strpos($text, "oembed")){
// convert non ascii chars to html entities
- $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
+
+ // mb_convert_encoding() is deprecated
+ // $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
+ $html_text = mb_encode_numericentity($text, [0x80, 0x10FFFF, 0, ~0], 'UTF-8');
// If it doesn't parse at all, just return the text.