MDL-11413 revisited; backported from HEAD

This commit is contained in:
skodak
2007-09-24 15:26:58 +00:00
parent 676dbd7285
commit 7c84c844f9
+2 -2
View File
@@ -1659,10 +1659,10 @@ function clean_text($text, $format=FORMAT_MOODLE) {
/// Fix non standard entity notations
$text = preg_replace('/(&#[0-9]+)(;?)/', "\\1;", $text);
$text = preg_replace('/(&#x[0-9a-fA-F]+)(;?)/', "\\1;", $text);
$text = str_replace(':', ':', $text);
/// Remove tags that are not allowed
$text = strip_tags($text, $ALLOWED_TAGS);
$text = str_replace(':', ':', $text);
/// Clean up embedded scripts and , using kses
$text = cleanAttributes($text);
@@ -1736,7 +1736,7 @@ function cleanAttributes2($htmlArray){
$value = kses_decode_entities($value);
$value = preg_replace('/(&#[0-9]+)(;?)/', "\\1;", $value);
$value = preg_replace('/(&#x[0-9a-fA-F]+)(;?)/', "\\1;", $value);
$value = str_replace(':', ':', $value);
$value = str_replace(':', '', $value); //better not have these characters in output at all
if ($value === $prevvalue) {
$arreach['value'] = $value;
break;