MDL-24282 improved s() to deal better with hex encoded entities

diff --git a/lib/weblib.php b/lib/weblib.php
index 2656885..aaabf20 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -121,7 +121,7 @@ function s($var, $obsolete = false) {
         return '0';
     }
 
-    return preg_replace("/&(#\d+);/i", "&$1;", htmlspecialchars($var));
+    return preg_replace("/&#(\d+|x[0-7a-fA-F]+);/i", "&#$1;", htmlspecialchars($var, ENT_QUOTES, 'UTF-8', false));
 }
 
 /**