summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-12-16 13:35:31 +0100
committerAndrey Andreev <narf@devilix.net>2014-12-16 13:35:31 +0100
commit91b38db77d6863a6eed36fcc15feea5ba9a6343f (patch)
treef3c2b486edbc5117ba120d5103f68bb6a0d7aa87 /system/core
parenteceebe3bedfd635c41ce2d849bcb32766d1e6cb9 (diff)
parente11657cc3f721a59ccb9cf37d3c099bd6d02e6ab (diff)
Merge pull request #3418 from warpcode/develop
Fixes #3417
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/Security.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 8adc35676..8ad0518a4 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -673,7 +673,7 @@ class CI_Security {
// Decode numeric & UTF16 two byte entities
$str = html_entity_decode(
- preg_replace('/(&#(?:x0*[0-9a-f]{2,5}(?![0-9a-f;]))|(?:0*\d{2,4}(?![0-9;])))/iS', '$1;', $str),
+ preg_replace('/(&#(?:x0*[0-9a-f]{2,5}(?![0-9a-f;])|(?:0*\d{2,4}(?![0-9;]))))/iS', '$1;', $str),
$flag,
$charset
);