L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-72139-master' of git://github.com/cescobedo/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2021-07-14 13:59:50 +02:00
parent e8859a60fc 7a6d65eedb
commit 6c27c79512
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/classes/helper.php
+13 -11
View File
@@ -690,18 +690,20 @@ class helper {
public static function prevent_unclosed_html_tags(
string $message,
bool $removebody = false
) : string
{
$html = '';
if (!empty($message)) {
$doc = new DOMDocument();
@$doc->loadHTML($message);
$html = $doc->getElementsByTagName('body')->item(0)->C14N(false, true);
if ($removebody) {
// Remove <body> element added in C14N function.
$html = preg_replace('~<(/?(?:body))[^>]*>\s*~i', '', $html);
}
) : string {
$html = '';
if (!empty($message)) {
$doc = new DOMDocument();
$olderror = libxml_use_internal_errors(true);
$doc->loadHTML('<?xml version="1.0" encoding="UTF-8" ?>' . $message);
libxml_clear_errors();
libxml_use_internal_errors($olderror);
$html = $doc->getElementsByTagName('body')->item(0)->C14N(false, true);
if ($removebody) {
// Remove <body> element added in C14N function.
$html = preg_replace('~<(/?(?:body))[^>]*>\s*~i', '', $html);
}
}
return $html;
}
message/tests/helper_test.php
+3
View File
@@ -214,6 +214,9 @@ class core_message_helper_testcase extends advanced_testcase {
'Empty html' => [
'', '', false
],
'Check encoding UTF-8 is working' => [
'<body><h1>Title</h1><p>السلام عليكم</p></body>', '<body><h1>Title</h1><p>السلام عليكم</p></body>', false
],
];
}
}