MDL-11413 revisited; backported from HEAD

moodle · Sep 24, 2007 · 7c84c84 · 7c84c84
1 parent 676dbd7
commit 7c84c84
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/weblib.php b/lib/weblib.php
@@ -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('&#x03A;', ':', $text);
 
         /// Remove tags that are not allowed
             $text = strip_tags($text, $ALLOWED_TAGS);
+            $text = str_replace('&#x03A;', ':', $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('&#x03A;', ':', $value);
+                $value = str_replace('&#x03A;', '', $value); //better not have these characters in output at all
                 if ($value === $prevvalue) {
                     $arreach['value'] = $value;
                     break;