summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-10-18 19:57:41 +0200
committerAndrey Andreev <narf@devilix.net>2013-10-18 19:57:41 +0200
commit3fa729d7092c814fe14e15d8d51789ce7907f2a8 (patch)
treee1964d5edbbbd995f3e3e3f3cb134bbb2002b5e5 /system/core
parent643bf02abd9a03b3a5074cda36fba8ca50814cfb (diff)
Fix issue #2681 (alternative to PR #2690)
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Security.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 6f5f5cb90..5c5c0efb6 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -553,9 +553,9 @@ class CI_Security {
{
$matches = $matches1 = 0;
+ $str = preg_replace('~(&#x0*[0-9a-f]{2,5});?~iS', $str, -1, $matches);
+ $str = preg_replace('~(&#\d{2,4});?~S', $str, -1, $matches1);
$str = html_entity_decode($str, ENT_COMPAT, $charset);
- $str = preg_replace('~&#x(0*[0-9a-f]{2,5})~ei', 'chr(hexdec("\\1"))', $str, -1, $matches);
- $str = preg_replace('~&#([0-9]{2,4})~e', 'chr(\\1)', $str, -1, $matches1);
}
while ($matches OR $matches1);