Merge branch 'develop' into 22accreturn

This commit is contained in:
Alexandre SPANGARO 2025-01-06 14:12:02 +01:00
commit 68226d4399
2 changed files with 4 additions and 2 deletions

View file

@ -1257,7 +1257,7 @@ class Conf extends stdClass
if (!isset($this->MAIN_RESTRICTHTML_ONLY_VALID_HTML)) {
$this->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
}
if (!isset($this->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY)) {
if (!isset($this->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY) && extension_loaded('tidy') && class_exists("tidy")) {
$this->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
}

View file

@ -772,9 +772,11 @@ class SecurityTest extends CommonClassTest
// Set options for cleaning data
$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0; // disabled, does not work on HTML5 and some libxml versions
// Enabled option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY if possible
// Enable option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY if possible
if (extension_loaded('tidy') && class_exists("tidy")) {
$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
} else {
$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 0;
}
$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0; // disabled, does not work on HTML5 and some libxml versions