From d630512b9c9ba00fee37e24ee203f0beb121c50a Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Sun, 19 Sep 2010 15:27:00 +0000
Subject: [PATCH] MDL-24282 improved s() to deal better with hex encoded
 entities

---
 lib/weblib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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