MDL-21026 improved entity handling

diff --git a/lib/weblib.php b/lib/weblib.php
index 37c148f505c0da0a74a1e352d8cb22a0ebec3205..d175fcc6d7927c77dff56964c152c01b1dc50364 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1149,8 +1149,8 @@ function wikify_links($string) {
  * @return string
  */
 function fix_non_standard_entities($string) {
-    $text = preg_replace('/(&#[0-9]+)(;?)/', '$1;', $string);
-    $text = preg_replace('/(&#x[0-9a-fA-F]+)(;?)/', '$1;', $text);
+    $text = preg_replace('/&#0*([0-9]+);?/', '&#$1;', $string);
+    $text = preg_replace('/&#x0*([0-9a-fA-F]+);?/', '&#x$1;', $text);
     return $text;
 }