summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-01-20 09:30:11 +0100
committerAndrey Andreev <narf@devilix.net>2014-01-20 09:30:11 +0100
commitebdb4ea3101f956d02571cd01ec89bcd0c44f8bb (patch)
tree43689c40820831ff324ed2039d19e775085316f8 /system
parentf375272f3f9eaefe3b10f4d00b3fbe18faa77da5 (diff)
parent1c8245a22874051f5342824d5299d6ad55f4995c (diff)
Merge branch 'develop' into feature/output_compressed_cache
Diffstat (limited to 'system')
-rw-r--r--system/core/Security.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 0944fef92..4c01da2b8 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -551,13 +551,13 @@ class CI_Security {
do
{
- $matches = $matches1 = 0;
+ $m1 = $m2 = 0;
- $str = preg_replace('~(&#x0*[0-9a-f]{2,5});?~iS', '$1;', $str, -1, $matches);
- $str = preg_replace('~(&#\d{2,4});?~S', '$1;', $str, -1, $matches1);
+ $str = preg_replace('/(&#x0*[0-9a-f]{2,5})(?![0-9a-f;])/iS', '$1;', $str, -1, $m1);
+ $str = preg_replace('/(&#\d{2,4})(?![0-9;])/S', '$1;', $str, -1, $m2);
$str = html_entity_decode($str, ENT_COMPAT, $charset);
}
- while ($matches OR $matches1);
+ while ($m1 OR $m2);
return $str;
}