From 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Wed, 11 Sep 2013 15:56:48 +0200 Subject: Merge up to r3319 --- framework/3rdParty/SafeHtml/TSafeHtmlParser.php | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'framework/3rdParty/SafeHtml') diff --git a/framework/3rdParty/SafeHtml/TSafeHtmlParser.php b/framework/3rdParty/SafeHtml/TSafeHtmlParser.php index f26c0ae1..29f2cb65 100644 --- a/framework/3rdParty/SafeHtml/TSafeHtmlParser.php +++ b/framework/3rdParty/SafeHtml/TSafeHtmlParser.php @@ -364,21 +364,21 @@ class TSafeHtmlParser } } - $tempval = preg_replace_callback( - '/&#(\d+);?/m', - function ($matches) { - return chr($matches[0]); - }, - $value - ); //"' - - $tempval = preg_replace_callback( - '/&#x([0-9a-f]+);?/mi', - function ($matches) { - return chr(hexdec($matches[0])); - }, - $tempval - ); + $tempval = preg_replace_callback( + '/&#(\d+);?/m', + function ($matches) { + return chr($matches[0]); + }, + $value + ); //"' + + $tempval = preg_replace_callback( + '/&#x([0-9a-f]+);?/mi', + function ($matches) { + return chr(hexdec($matches[0])); + }, + $tempval + ); if ((in_array($name, $this->protocolAttributes)) && (strpos($tempval, ':') !== false)) -- cgit v1.2.3